Merge branch 'master' into subtitles_rework
[youtube-dl] / youtube_dl / extractor / kankan.py
2013-08-22 Ismael MejiaMerge branch 'master' into subtitles_rework
2013-08-07 Philipp HagemeisterMerge commit '7a4c6cc92f9ffec9135652a49153caffa5520c29'
2013-07-30 Jaime Marquínez... Merge pull request #1148 from JohnyMoSwag/master
2013-07-30 Jaime Marquínez... Merge pull request #1149 from pishposhmcgee/patch-3
2013-07-29 Jaime Marquínez... Add an extractor for kankan.com (closes #1133)