tree 6c2a61624f7ee08f2da45f40f1a1499e0d7f13fa
parent 6806cd0f5a7be278da7d2c22fcfc31aff8ee2c71
parent 5148029aaf204fb3e7e4f24a794bee781d0c218b
author Andrey Andreev <narf@bofh.bg> 1330077350 +0200
committer Andrey Andreev <narf@bofh.bg> 1330077350 +0200

Merge upstream branch