Merge remote-tracking branch 'yasoob/master'

Conflicts:
	youtube_dl/extractor/__init__.py

diff --combined youtube_dl/extractor/__init__.py
index 98733e39465d6c865d8a0237dea73099f595ad39,ec800d9fbc42dd84acc13674b092b81a935d4831..ba0e867138952b4dad6542b5e6202635fec3f2a1
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -47,16 -47,14 +47,17 @@@ 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
  from .vimeo import VimeoIE
  from .vine import VineIE
 +from .wat import WatIE
  from .wimp import WimpIE
  from .worldstarhiphop import WorldStarHipHopIE
  from .xhamster import XHamsterIE