Merge branch 'googledrive' of github.com:remitamine/youtube-dl into remitamine-google...
authorremitamine <remitamine@gmail.com>
Mon, 21 Dec 2015 02:15:19 +0000 (03:15 +0100)
committerremitamine <remitamine@gmail.com>
Mon, 21 Dec 2015 02:15:19 +0000 (03:15 +0100)
commita8ae232fa9c24534bd9c838c793f182e6796fe4e
tree1a30e1e7d049c9b669adc0eb3385bfb3fde5a662
parentb9a324c0daafb9484a2575783b6b120a7de885ff
parent5b251628e9f45c89c1becb3f62c4212874eb74ea
Merge branch 'googledrive' of github.com:remitamine/youtube-dl into remitamine-googledrive
youtube_dl/extractor/__init__.py
youtube_dl/extractor/generic.py