Merge branch 'master' into subtitles_rework
authorIsmael Mejia <iemejia@gmail.com>
Mon, 26 Aug 2013 02:03:40 +0000 (04:03 +0200)
committerIsmael Mejia <iemejia@gmail.com>
Tue, 27 Aug 2013 22:33:12 +0000 (00:33 +0200)
commit06a401c845289344bfe8998a0acad07f79fe7818
tree21006d0073cc901010d8793f95293bc2e5d6a2cf
parentbd2dee6c67b837bdebdd28d10d9586129021330e
parentd4051a8e051a06ddeab905a4b5fcc7ddb70952bf
Merge branch 'master' into subtitles_rework
youtube_dl/__init__.py
youtube_dl/extractor/dailymotion.py
youtube_dl/extractor/youtube.py