Merge branch 'remitamine-shahid'
authorSergey M․ <dstftw@gmail.com>
Sat, 15 Aug 2015 12:13:53 +0000 (18:13 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 15 Aug 2015 12:13:53 +0000 (18:13 +0600)

Trivial merge