Merge branch 'master' into subtitles_rework
authorIsmael Mejia <iemejia@gmail.com>
Fri, 6 Sep 2013 21:23:23 +0000 (23:23 +0200)
committerIsmael Mejia <iemejia@gmail.com>
Fri, 6 Sep 2013 21:24:41 +0000 (23:24 +0200)
commit72836fcee453386f4f16325c5b8fa4c1ba1bb442
tree58efd36f4a56269a07774969e2ac385aacf8eae6
parentd6e203b3dcef8f291b57021903e629d3e30e1f0b
parenta7130543fa0368175740f5fa173ef920671db866
Merge branch 'master' into subtitles_rework
youtube_dl/__init__.py
youtube_dl/extractor/dailymotion.py
youtube_dl/extractor/youtube.py