tree 1e8fc9dd10c8723482a691af1b1800ab02ac534e
parent 81fe6bf6933d44c991ce736a5b33efebdfcb39d7
parent 16af6afe991381360439135ddb0735dab1280fed
author Andrey Andreev <narf@bofh.bg> 1328877181 +0200
committer Andrey Andreev <narf@bofh.bg> 1328877181 +0200

Merge upstream branch