tree f8aacb53814260b161bd5f39e0c292d6ec47aed3
parent cf63120a60da9485ab1f94bc58b5d62e6b05a0fd
parent 827a92a6965612b185ae2e6766b6fb7740cd0cc2
author Andrey Andreev <narf@bofh.bg> 1329385572 +0200
committer Andrey Andreev <narf@bofh.bg> 1329385572 +0200

Merge upstream branch