From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 28 Mar 2014 22:21:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'phaer/add-oe1-support'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=e9a6fd6a68024b7835d4ee664c921ef3f3591594;p=youtube-dl

Merge remote-tracking branch 'phaer/add-oe1-support'
---

e9a6fd6a68024b7835d4ee664c921ef3f3591594
diff --cc youtube_dl/extractor/__init__.py
index eef13d2b8,0e4b2b6e8..8e81fa619
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -177,7 -177,7 +177,8 @@@ from .normalboots import NormalbootsI
  from .novamov import NovaMovIE
  from .nowness import NownessIE
  from .nowvideo import NowVideoIE
 +from .ntv import NTVIE
+ from .oe1 import OE1IE
  from .ooyala import OoyalaIE
  from .orf import ORFIE
  from .parliamentliveuk import ParliamentLiveUKIE