tree 402c0fc0323f4024d26b35c952b4684956d1c46c
parent 2134173e015a2c78d9970a14dc79ac58f1dedc09
parent 8f22057724dd8fe2b9d41ba98bfc4da282572c5e
author Andrey Andreev <narf@bofh.bg> 1330686907 +0200
committer Andrey Andreev <narf@bofh.bg> 1330686907 +0200

Merge upstream branch