Merge pull request #937 from jaimeMF/subtitles_rework
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Fri, 23 Aug 2013 09:40:25 +0000 (02:40 -0700)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Fri, 23 Aug 2013 09:40:25 +0000 (02:40 -0700)
Subtitles rework

1  2 
youtube_dl/YoutubeDL.py
youtube_dl/extractor/common.py
youtube_dl/extractor/youtube.py

Simple merge
Simple merge
Simple merge