tree 3b2c258724bb6608541e9ea70fddafc9bc6c202f
parent 168e918a43ff07b0ac887e0ddc95a76c9cd57c8c
parent e2675736f3a68b1f64e135d827f6a70e0ae892fb
author Andrey Andreev <narf@bofh.bg> 1329933006 +0200
committer Andrey Andreev <narf@bofh.bg> 1329933006 +0200

Merge upstream branch