Merge branch 'master' of https://github.com/linhua55/youtube-dl into linhua55-master
[youtube-dl] / youtube_dl / extractor / sandia.py
2015-02-23 Jaime Marquínez... Merge branch 'subtitles-rework'
2015-02-18 Philipp Hagemeister[sandia] Add new extractor (#4974)