Merge branch 'oppetarkiv' of https://github.com/thc202/youtube-dl into thc202-oppetarkiv
authorSergey M․ <dstftw@gmail.com>
Sat, 28 Feb 2015 14:41:56 +0000 (20:41 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 28 Feb 2015 14:41:56 +0000 (20:41 +0600)

Trivial merge