]> git.stg.codes - stg.git/commitdiff
Merge remote-tracking branch 'origin/master' into ticket ticket
authorElena Mamontova <helenh463@gmail.com>
Thu, 19 Jan 2017 14:00:03 +0000 (16:00 +0200)
committerElena Mamontova <helenh463@gmail.com>
Thu, 19 Jan 2017 14:00:03 +0000 (16:00 +0200)

Trivial merge