From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sun, 8 Jun 2014 19:06:32 +0000 (+0300)
Subject: Merge branch 'naffanya-dev'
X-Git-Tag: 2.409~312
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/258b7ce79dba0c01b378e73bd6b8ee9fb1ae695d?hp=258b7ce79dba0c01b378e73bd6b8ee9fb1ae695d

Merge branch 'naffanya-dev'
---