Merge branch 'mrkolby-vgtv'
authorSergey M․ <dstftw@gmail.com>
Mon, 8 Sep 2014 14:26:59 +0000 (21:26 +0700)
committerSergey M․ <dstftw@gmail.com>
Mon, 8 Sep 2014 14:26:59 +0000 (21:26 +0700)

Trivial merge