tree 7b4908c8d10325e8940888ef2ec77e19471125b2
parent 5ee8c3ab2f670c678ca20100a4e1786514371c23
parent a00e50483ab27d8ba3d3a2aa1a5138bfa8c8be70
author Andrey Andreev <narf@bofh.bg> 1332753880 +0300
committer Andrey Andreev <narf@bofh.bg> 1332753880 +0300

Merge upstream branch