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

Conflicts: youtube_dl/extractor/__init__.py
2014-09-05 19:01:11 +07:00 · 2014-09-05 19:01:11 +07:00 · 1c1cff6a52
commit 1c1cff6a52
parent f2d9e3a370 f063a04f07
2 changed files with 77 additions and 0 deletions
--- a/youtube_dl/extractor/init.py
+++ b/youtube_dl/extractor/init.py
@ -67,6 +67,7 @@ from .dailymotion import (
    DailymotionUserIE,
 )
 from .daum import DaumIE
+from .dbtv import DBTVIE
 from .dfb import DFBIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE