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

Merge branch 'naffanya-dev'
---

d084d9ae9f7bcd7f7d1926e7eeae921dbad49273