tree 2c16baf2ceb5a76032348ec1f646021c1237c40d
parent 55ab7646306ea150950df696b5db7ccc737ae965
parent e2675736f3a68b1f64e135d827f6a70e0ae892fb
author Andrey Andreev <narf@bofh.bg> 1329932925 +0200
committer Andrey Andreev <narf@bofh.bg> 1329932925 +0200

Merge upstream branch