tree 13f9a9ad2c8f2e92fcb21f34b60cf364eee47d88
parent c4fcb6ac466173696f765d3c7ca16b823d2cb04e
parent 5148029aaf204fb3e7e4f24a794bee781d0c218b
author Andrey Andreev <narf@bofh.bg> 1330077412 +0200
committer Andrey Andreev <narf@bofh.bg> 1330077412 +0200

Merge upstream branch