Merge branch 'pr-twitter' of https://github.com/atomicdryad/youtube-dl into atomicdry...
authorYen Chi Hsuan <yan12125@gmail.com>
Sun, 18 Oct 2015 08:49:56 +0000 (16:49 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sun, 18 Oct 2015 08:49:56 +0000 (16:49 +0800)
1  2 
youtube_dl/extractor/__init__.py

Simple merge