tree 968fcaa7602c21f2ae48a58ab5cf392a08cfed59
parent 7ee1f0f21fcae03df584918fa2233c865ca01d25
parent b211adee89f5fd2192051e9c0826146bd150f469
author Andrey Andreev <narf@bofh.bg> 1328211468 +0200
committer Andrey Andreev <narf@bofh.bg> 1328211468 +0200

Merge upstream branch