Merge branch 'master' of https://github.com/Lovius/youtube-dl into Lovius-master
authorSergey M․ <dstftw@gmail.com>
Fri, 12 Sep 2014 11:18:26 +0000 (18:18 +0700)
committerSergey M․ <dstftw@gmail.com>
Fri, 12 Sep 2014 11:18:26 +0000 (18:18 +0700)
1  2 
youtube_dl/extractor/__init__.py

Simple merge