Merge branch 'cinemassacre' of https://github.com/rzhxeo/youtube-dl into rzhxeo-cinem...
authorSergey M․ <dstftw@gmail.com>
Wed, 28 May 2014 12:31:23 +0000 (19:31 +0700)
committerSergey M․ <dstftw@gmail.com>
Wed, 28 May 2014 12:31:23 +0000 (19:31 +0700)

Trivial merge