Merge branch 'Frenzie-npo'
authorSergey M․ <dstftw@gmail.com>
Thu, 5 Feb 2015 14:15:13 +0000 (20:15 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 5 Feb 2015 14:15:13 +0000 (20:15 +0600)

Trivial merge