Merge branch 'Tassatux-noco'
authorSergey M․ <dstftw@gmail.com>
Mon, 4 May 2015 20:50:58 +0000 (02:50 +0600)
committerSergey M․ <dstftw@gmail.com>
Mon, 4 May 2015 20:50:58 +0000 (02:50 +0600)

Trivial merge