Merge branch 'master' into openload-phantomjs-method
[youtube-dl] / youtube_dl / extractor / njpwworld.py
2017-02-25 Yen Chi Hsuan[njpwworld] Add new extractor (closes #11561)