Merge branch 'srgssr' of https://github.com/remitamine/youtube-dl into remitamine...
authorremitamine <remitamine@gmail.com>
Tue, 29 Dec 2015 09:57:45 +0000 (10:57 +0100)
committerremitamine <remitamine@gmail.com>
Tue, 29 Dec 2015 09:57:45 +0000 (10:57 +0100)
1  2 
youtube_dl/extractor/__init__.py

Simple merge