Merge branch 'pinkbike' of https://github.com/misterhat/youtube-dl into misterhat...
authorSergey M․ <dstftw@gmail.com>
Fri, 19 Jun 2015 17:00:00 +0000 (23:00 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 19 Jun 2015 17:00:00 +0000 (23:00 +0600)
1  2 
youtube_dl/extractor/__init__.py

Simple merge