]> git.stg.codes - stg.git/commitdiff
Merge branch 'naffanya-dev'
authorMaxim Mamontov <faust.madf@gmail.com>
Sun, 8 Jun 2014 19:06:32 +0000 (22:06 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Sun, 8 Jun 2014 19:06:32 +0000 (22:06 +0300)

Trivial merge