tree cf80f02092a50db6b2857a54c7f558d7dcb1158c
parent 0fd760e9765ea6785b4bd59d65365a079717ca6a
parent 3396d531e2f3864d06860cdbdf7320bc121f77f1
author Andrey Andreev <narf@bofh.bg> 1333335819 +0300
committer Andrey Andreev <narf@bofh.bg> 1333335819 +0300

Merge upstream branch