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)
commit78653a33aa00ba5205940c2baac5d9f019795b88
tree246fd038effd402bc66de4c8afb36e6c318efcaa
parent77302fe5c989b9cafcb675c0a03642b80fa557ff
parent24dc1ed715239f85eb3d5f71a707da1dd2bc7773
Merge remote-tracking branch 'upstream/master' into bliptv
youtube_dl/extractor/__init__.py
youtube_dl/extractor/generic.py