Merge branch 'crooksandliars' of https://github.com/fstirlitz/youtube-dl into fstirli...
authorSergey M․ <dstftw@gmail.com>
Sat, 11 Apr 2015 13:34:06 +0000 (19:34 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 11 Apr 2015 13:34:06 +0000 (19:34 +0600)
1  2 
youtube_dl/extractor/__init__.py

Simple merge