tree 28004d93d998865c575f69df5c3e78f726038ef5
parent c7ca1a66c43f7a17f477316c07cf29c7b2526753
parent e35d6943d513b4f016b763eebe8b97a9f1c902e3
author Andrey Andreev <narf@bofh.bg> 1329211938 +0200
committer Andrey Andreev <narf@bofh.bg> 1329211938 +0200

Merge remote-tracking branch 'upstream/develop' into develop-issue-128