Merge branch 'pishposhmcgee-master'
authorSergey M․ <dstftw@gmail.com>
Wed, 11 Mar 2015 15:56:40 +0000 (21:56 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 11 Mar 2015 15:56:40 +0000 (21:56 +0600)

Trivial merge