tree ffe257a549ae70749dcf4646695a0d73535e237e
parent 87ac4260063e3a62805cc8f6f73cd2eb18da663a
parent 928b9aa6340654b1dbb69af44c41468456f0b7b6
author Andrey Andreev <narf@bofh.bg> 1339097116 +0300
committer Andrey Andreev <narf@bofh.bg> 1339097116 +0300

Merge upstream branch