Merge branch 'DavidFabijan-mojvideo'
authorSergey M․ <dstftw@gmail.com>
Wed, 6 Aug 2014 13:38:27 +0000 (20:38 +0700)
committerSergey M․ <dstftw@gmail.com>
Wed, 6 Aug 2014 13:38:27 +0000 (20:38 +0700)

Trivial merge