From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 10 Jan 2015 16:51:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'Dineshs91/f4m-2.0'
X-Git-Tag: 2015.01.10.1~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=121c09c7be1ac2944f3432122104c1952bfd1f04;p=youtube-dl.git

Merge remote-tracking branch 'Dineshs91/f4m-2.0'
---

121c09c7be1ac2944f3432122104c1952bfd1f04
diff --cc youtube_dl/extractor/__init__.py
index b908eb38ce,7918f9ab72..fc83a7d07f
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -340,9 -297,9 +340,10 @@@ from .ro220 import Ro220I
  from .rottentomatoes import RottenTomatoesIE
  from .roxwel import RoxwelIE
  from .rtbf import RTBFIE
+ from .rte import RteIE
  from .rtlnl import RtlXlIE
  from .rtlnow import RTLnowIE
 +from .rtp import RTPIE
  from .rts import RTSIE
  from .rtve import RTVEALaCartaIE, RTVELiveIE
  from .ruhd import RUHDIE