Merge branch 'sexykarma' of https://github.com/CkuT/youtube-dl into CkuT-sexykarma
authorSergey M <dstftw@gmail.com>
Sat, 18 Oct 2014 17:06:53 +0000 (00:06 +0700)
committerSergey M <dstftw@gmail.com>
Sat, 18 Oct 2014 17:06:53 +0000 (00:06 +0700)
1  2 
youtube_dl/extractor/__init__.py

Simple merge