From: Elena Mamontova <helenh463@gmail.com>
Date: Wed, 20 Jul 2016 14:57:02 +0000 (+0300)
Subject: Merge branch 'master' into ticket
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/b3bf247163c78d1bac74702459a4d53700280ebe

Merge branch 'master' into ticket
---

b3bf247163c78d1bac74702459a4d53700280ebe