Merge remote-tracking branch 'gitprojs/master'

Conflicts:
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister 2013-06-27 18:16:41 +02:00
commit 3a8736bd74
2 changed files with 40 additions and 0 deletions

View file

@ -1,6 +1,7 @@
from .ard import ARDIE
from .arte import ArteTvIE
from .auengine import AuengineIE
from .bandcamp import BandcampIE
from .bliptv import BlipTVIE, BlipTVUserIE
from .breakcom import BreakIE
@ -138,6 +139,7 @@ def gen_extractors():
CSpanIE(),
WimpIE(),
HotNewHipHopIE(),
AuengineIE(),
GenericIE()
]