Merge branch 'corone17-patch-1'
authorSergey M․ <dstftw@gmail.com>
Sun, 5 Jul 2015 13:07:51 +0000 (19:07 +0600)
committerSergey M․ <dstftw@gmail.com>
Sun, 5 Jul 2015 13:07:51 +0000 (19:07 +0600)

Trivial merge