Merge remote-tracking branch 'upstream/master' into bliptv
authorremitamine <remitamine@gmail.com>
Thu, 3 Dec 2015 19:33:22 +0000 (20:33 +0100)
committerremitamine <remitamine@gmail.com>
Thu, 3 Dec 2015 19:33:22 +0000 (20:33 +0100)
1  2 
youtube_dl/extractor/__init__.py
youtube_dl/extractor/generic.py

Simple merge
Simple merge