From: Maxim Mamontov <faust@stg.dp.ua>
Date: Fri, 23 Aug 2013 18:59:58 +0000 (+0300)
Subject: Merge branch 'naffanya-dev'
X-Git-Tag: 2.409~339
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/b078cd0fbf7dee4e222fcffffac2ded8a3c9d3a3?ds=inline;hp=b078cd0fbf7dee4e222fcffffac2ded8a3c9d3a3

Merge branch 'naffanya-dev'
---