tree 49fe1fafd8a71f8b854050b1e236c00e44719e3e
parent 82e88b9b3031163d2f86f8e53450c1d779a08d8f
parent b457a4001ce2380e97f36b0a983b477c3e31de69
author Andrey Andreev <narf@bofh.bg> 1333977504 +0300
committer Andrey Andreev <narf@bofh.bg> 1333977504 +0300

Merge upstream branch