Merge remote-tracking branch 'FiloSottille/supports'

Conflicts:
	youtube-dl
This commit is contained in:
Philipp Hagemeister
2012-09-27 19:24:41 +02:00
3 changed files with 148 additions and 28 deletions

View File

@@ -351,6 +351,7 @@ def gen_extractors():
MixcloudIE(),
StanfordOpenClassroomIE(),
MTVIE(),
YoukuIE(),
XNXXIE(),
GenericIE()