Merge branch 'master' into subtitles_rework
authorIsmael Mejia <iemejia@gmail.com>
Thu, 22 Aug 2013 21:29:36 +0000 (23:29 +0200)
committerIsmael Mejia <iemejia@gmail.com>
Thu, 22 Aug 2013 21:29:36 +0000 (23:29 +0200)
commit18b4e04f1c663e0ea695f6501b860f85af9d7ca1
treed60ebbf51b8c50f808c6c251fc6c02547052a9dc
parentd80a064eff4fe2416f9db36b07f1e2ca641f1334
parent1865ed31b955795f9859df5c1c400d172ae9a28a
Merge branch 'master' into subtitles_rework
.gitignore
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
youtube_dl/extractor/common.py
youtube_dl/extractor/dailymotion.py
youtube_dl/extractor/youtube.py