Merge branch 'hlintala-5tv'
authorSergey M․ <dstftw@gmail.com>
Fri, 12 Jun 2015 11:49:07 +0000 (17:49 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 12 Jun 2015 11:49:07 +0000 (17:49 +0600)

Trivial merge