Merge branch 'dbtv' of https://github.com/mrkolby/youtube-dl into mrkolby-dbtv

Conflicts:
	youtube_dl/extractor/__init__.py

diff --cc youtube_dl/extractor/__init__.py
index d54ad80574e6ce18730d5647ca6c5a2134494177,c43dfd7ea1f438f48b2071160bad8ba553b53211..7adca7df918e293a57b73f9e585e366cf8780ca6
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -67,12 -62,10 +67,13 @@@ from .dailymotion import 
      DailymotionUserIE,
  )
  from .daum import DaumIE
+ from .dbtv import DBTVIE
 +from .dfb import DFBIE
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
 +from .drtuber import DrTuberIE
  from .drtv import DRTVIE
 +from .dump import DumpIE
  from .defense import DefenseGouvFrIE
  from .discovery import DiscoveryIE
  from .divxstage import DivxStageIE