tree 276943a51e282d0d684304048ada830b55f9fb2e
parent 00aed0d9015040764fb7fe8edb7452459fc19213
parent b457a4001ce2380e97f36b0a983b477c3e31de69
author Andrey Andreev <narf@bofh.bg> 1333977260 +0300
committer Andrey Andreev <narf@bofh.bg> 1333977260 +0300

Merge upstream branch