tree 8998772c1a7632e640ff2b92b183a9de2f62b5fc
parent 09bb0f4c51351002f9200d7a9ddb6cb081ab3731
parent 963386ba6072d240840b58d6dbe54287edcb04ad
author Andrey Andreev <narf@bofh.bg> 1330646212 +0200
committer Andrey Andreev <narf@bofh.bg> 1330646212 +0200

Merge upstream branch