Merge branch 'viki-shows' of https://github.com/ping/youtube-dl into ping-viki-shows
authorSergey M․ <dstftw@gmail.com>
Wed, 20 May 2015 14:17:47 +0000 (20:17 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 20 May 2015 14:17:47 +0000 (20:17 +0600)
1  2 
youtube_dl/extractor/__init__.py

Simple merge