Merge branch 'dhm' of https://github.com/ossi96/youtube-dl into ossi96-dhm
authorSergey M․ <dstftw@gmail.com>
Sat, 28 Mar 2015 16:09:05 +0000 (22:09 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 28 Mar 2015 16:09:05 +0000 (22:09 +0600)

Trivial merge