tree eef01a98150dc7703a98266fe92b0a802078b083
parent 0cfc3fdaf1f0b928dd3cf3fc916275d30f34a550
parent 8e2478e7310b5cfff88b64ff5d84b71f1c124b58
author Andrey Andreev <narf@bofh.bg> 1332936107 +0300
committer Andrey Andreev <narf@bofh.bg> 1332936107 +0300

Merge upstream branch