Merge remote-tracking branch 'origin/HEAD'
[youtube-dl] / youtube_dl / extractor / cspan.py
2013-06-26 Philipp Hagemeister[wimp] minor readability improvements (#940)
2013-06-26 Jaime Marquínez... Add CSpanIE (closes #312)