From: Naffanya <naffanya@naffanya.(none)>
Date: Thu, 10 Apr 2014 00:39:50 +0000 (+0300)
Subject: Merge branch 'master' into naffanya-dev
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/fc0e3a75f76a611f67a846737dabda1c64b2ecd0?hp=--cc

Merge branch 'master' into naffanya-dev
---

fc0e3a75f76a611f67a846737dabda1c64b2ecd0