Merge branch 'remitamine-clipfish'
authorSergey M․ <dstftw@gmail.com>
Fri, 7 Aug 2015 19:11:06 +0000 (01:11 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 7 Aug 2015 19:11:06 +0000 (01:11 +0600)

Trivial merge