From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 21 Aug 2014 23:52:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'terminalmage/add-patreon'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=b27295d2ab6e9e720a1ed26477841ddb224848bf;p=youtube-dl

Merge remote-tracking branch 'terminalmage/add-patreon'
---

b27295d2ab6e9e720a1ed26477841ddb224848bf
diff --cc youtube_dl/extractor/__init__.py
index 7ad5d9318,cf7a8d6e1..9be1d2e0f
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -233,13 -222,11 +233,14 @@@ from .nrk import 
  from .ntv import NTVIE
  from .nytimes import NYTimesIE
  from .nuvid import NuvidIE
 -from .oe1 import OE1IE
  from .ooyala import OoyalaIE
 -from .orf import ORFIE
 +from .orf import (
 +    ORFTVthekIE,
 +    ORFOE1IE,
 +    ORFFM4IE,
 +)
  from .parliamentliveuk import ParliamentLiveUKIE
+ from .patreon import PatreonIE
  from .pbs import PBSIE
  from .photobucket import PhotobucketIE
  from .playvid import PlayvidIE