tree 0a16daeb719969d7e81f3e00d35be94c140c4641
parent 99013ed3ed0ea5641a6c6b6afa08a7befb579cb0
parent fdb75418c9c4b87e9d7f15f1b59fe8d55739c8f3
author Andrey Andreev <narf@bofh.bg> 1330958026 +0200
committer Andrey Andreev <narf@bofh.bg> 1330958026 +0200

Merge upstream branch