From: Philipp Hagemeister Date: Mon, 1 Jul 2013 13:19:45 +0000 (+0200) Subject: Merge remote-tracking branch 'yasoob/master' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=53936f3d571cc5ef36742f468666d04fc995056a;p=youtube-dl Merge remote-tracking branch 'yasoob/master' Conflicts: youtube_dl/extractor/__init__.py --- 53936f3d571cc5ef36742f468666d04fc995056a diff --cc youtube_dl/extractor/__init__.py index 98733e394,ec800d9fb..ba0e86713 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@@ -47,10 -47,9 +47,11 @@@ from .statigram import StatigramI 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 from .ustream import UstreamIE from .vbox7 import Vbox7IE from .vevo import VevoIE