]> git.stg.codes - stg.git/commitdiff
Merge branch 'master' into ticket
authorElena Mamontova <helenh463@gmail.com>
Wed, 20 Jul 2016 14:57:02 +0000 (17:57 +0300)
committerElena Mamontova <helenh463@gmail.com>
Wed, 20 Jul 2016 14:57:02 +0000 (17:57 +0300)

Trivial merge