Merge remote-tracking branch 'yasoob/master'

Conflicts:
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister
2013-07-01 15:19:45 +02:00
2 changed files with 50 additions and 0 deletions

View File

@ -48,6 +48,7 @@ from .steam import SteamIE
from .teamcoco import TeamcocoIE
from .ted import TEDIE
from .tf1 import TF1IE
from .traileraddict import TrailerAddictIE
from .tudou import TudouIE
from .tumblr import TumblrIE
from .tutv import TutvIE