tree ddb25a94de1095598e1b88bc2d082552cef392e5
parent 3c7c461a93145b045ba688585a5b606e28b7d7cb
parent b790371f328e49ed57eda85bf33817e033b85601
author Andrey Andreev <narf@bofh.bg> 1326225869 +0200
committer Andrey Andreev <narf@bofh.bg> 1326225869 +0200

Merge upstream branch