tree cc979f745da239cdc8aff74ea6bf43cbea860cf6
parent 2d486231c0fbc9a5c9ad5bf6897e7bb1aff275ba
parent fa4af2c268eb920e8eb772b793962000c10ac79c
author Andrey Andreev <narf@bofh.bg> 1342700233 +0300
committer Andrey Andreev <narf@bofh.bg> 1342700233 +0300

Merge develop changes