Merge branch 'master' of https://github.com/zx8/youtube-dl into zx8-master
authorSergey M․ <dstftw@gmail.com>
Thu, 26 Mar 2015 17:57:13 +0000 (23:57 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 26 Mar 2015 17:57:13 +0000 (23:57 +0600)
1  2 
youtube_dl/extractor/__init__.py

Simple merge