From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 22 Feb 2014 13:38:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'JohnyMoSwag/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=af284c6d1b2833e1d3d3619306efca764e3e59af;hp=-c;p=youtube-dl

Merge remote-tracking branch 'JohnyMoSwag/master'
---

af284c6d1b2833e1d3d3619306efca764e3e59af
diff --combined youtube_dl/extractor/__init__.py
index 229bdc595,6377f8b4c..ad90a0b91
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -186,7 -186,6 +186,7 @@@ from .rutube import 
      RutubeMovieIE,
      RutubePersonIE,
  )
 +from .savefrom import SaveFromIE
  from .servingsys import ServingSysIE
  from .sina import SinaIE
  from .slashdot import SlashdotIE
@@@ -225,6 -224,7 +225,7 @@@ from .tinypic import TinyPicI
  from .toutv import TouTvIE
  from .traileraddict import TrailerAddictIE
  from .trilulilu import TriluliluIE
+ from .trutube import TruTubeIE
  from .tube8 import Tube8IE
  from .tudou import TudouIE
  from .tumblr import TumblrIE