Merge branch '5tv' of https://github.com/hlintala/youtube-dl into hlintala-5tv
authorSergey M․ <dstftw@gmail.com>
Fri, 12 Jun 2015 10:34:28 +0000 (16:34 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 12 Jun 2015 10:34:28 +0000 (16:34 +0600)
1  2 
youtube_dl/extractor/__init__.py

Simple merge