tree 082299080d2364538de758d05b49b15a89938aa9
parent fb86295d7d49e7ddfba266fe9f7305fb44708d4f
parent 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7
author Andrey Andreev <narf@bofh.bg> 1327691632 +0200
committer Andrey Andreev <narf@bofh.bg> 1327691632 +0200

Merge upstream branch