Merge branch 'ted_subtitles'
authorIsmaël Mejía <iemejia@gmail.com>
Sat, 2 Nov 2013 18:50:45 +0000 (19:50 +0100)
committerIsmaël Mejía <iemejia@gmail.com>
Sat, 2 Nov 2013 18:50:45 +0000 (19:50 +0100)
commit38db46794f3ccfef09094db9b411e55acd4c1a3d
tree8c184e42a5f9710c5bad78a080038a4885800ca8
parentaa2484e390d8a5e74d740fda61b4062a4a8c1d0e
parenta9a3876d55be943a7eaf505cbeb8fb862514db6c
Merge branch 'ted_subtitles'
youtube_dl/extractor/dailymotion.py
youtube_dl/extractor/youtube.py