From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 22 Feb 2014 16:14:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'soult/br'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=1052d2bfeca49900df67d15886eea31f671cdc8c;hp=-c;p=youtube-dl

Merge remote-tracking branch 'soult/br'
---

1052d2bfeca49900df67d15886eea31f671cdc8c
diff --combined youtube_dl/extractor/__init__.py
index ad90a0b91,989482a9b..3badcc238
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -19,6 -19,7 +19,7 @@@ from .bbccouk import BBCCoUkI
  from .blinkx import BlinkxIE
  from .bliptv import BlipTVIE, BlipTVUserIE
  from .bloomberg import BloombergIE
+ from .br import BRIE
  from .breakcom import BreakIE
  from .brightcove import BrightcoveIE
  from .c56 import C56IE
@@@ -186,7 -187,6 +187,7 @@@ from .rutube import 
      RutubeMovieIE,
      RutubePersonIE,
  )
 +from .savefrom import SaveFromIE
  from .servingsys import ServingSysIE
  from .sina import SinaIE
  from .slashdot import SlashdotIE
@@@ -225,7 -225,6 +226,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