tree 97683ed56c1d8de9d727fa803d2100d320773434
parent e78f81537c0859c6ee5b80a09fe63fa946122f01
author Andrey Andreev <narf@bofh.bg> 1349777475 +0300
committer Andrey Andreev <narf@bofh.bg> 1349777475 +0300

Merge changes from 2.1-stable