Merge branch 'jukebox' of https://github.com/remitamine/youtube-dl into remitamine...
authorremitamine <remitamine@gmail.com>
Tue, 29 Dec 2015 16:29:55 +0000 (17:29 +0100)
committerremitamine <remitamine@gmail.com>
Tue, 29 Dec 2015 16:31:18 +0000 (17:31 +0100)
commit06e4874c997fb523bd9d8e675d1ec0e69ab501ed
treeaa158ea2a2fc727e6e3c5131a18b6b69f574f7e1
parent0d8a0fdc30845aecfb9c98ccd4884dd1456dda86
parent3da3999612311ff193890072727208892b9e93f0
Merge branch 'jukebox' of https://github.com/remitamine/youtube-dl into remitamine-jukebox
youtube_dl/extractor/__init__.py
youtube_dl/extractor/generic.py