tree 62dee5a5c0ef73a257f0b45070fbbb2e786105e2
parent 965703d4aadec14010b2875b11c40763bf1985df
parent 40f1404344d09520e91d6d3cb9ccd23b786ca35e
author Andrey Andreev <narf@bofh.bg> 1340637720 +0300
committer Andrey Andreev <narf@bofh.bg> 1340637720 +0300

Merge changes from develop