Merge branch 'bliptv' of github.com:remitamine/youtube-dl into remitamine-bliptv
authorremitamine <remitamine@gmail.com>
Mon, 21 Dec 2015 03:31:17 +0000 (04:31 +0100)
committerremitamine <remitamine@gmail.com>
Mon, 21 Dec 2015 03:31:17 +0000 (04:31 +0100)
commit7ba71e30fb9ec188d122f79a914f688928e80e91
tree96864d5499f2024c3483a9d4970a1e6273bb90c5
parenta8ae232fa9c24534bd9c838c793f182e6796fe4e
parent7cb09524749d4a061acc801d0a2d6ad08463e549
Merge branch 'bliptv' of github.com:remitamine/youtube-dl into remitamine-bliptv
youtube_dl/extractor/__init__.py
youtube_dl/extractor/generic.py