Merge pull request #1705 from iemejia/master
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 10 Nov 2013 10:54:18 +0000 (11:54 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 10 Nov 2013 10:54:18 +0000 (11:54 +0100)
[ted] support for subtitles

1  2 
youtube_dl/extractor/youtube.py

Simple merge