Merge branch 'MiomioTv' of https://github.com/tiktok7/youtube-dl into tiktok7-MiomioTv
authorSergey M․ <dstftw@gmail.com>
Thu, 2 Apr 2015 15:12:47 +0000 (21:12 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 2 Apr 2015 15:12:47 +0000 (21:12 +0600)
1  2 
youtube_dl/extractor/__init__.py

Simple merge