From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 24 Oct 2014 13:02:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'capital-G/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=8d81f872fb9844ac640c84b8937d3a53b729d1aa;hp=-c;p=youtube-dl

Merge remote-tracking branch 'capital-G/master'
---

8d81f872fb9844ac640c84b8937d3a53b729d1aa
diff --combined youtube_dl/extractor/__init__.py
index 0de0b4587,e0957987c..3023c3095
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -26,6 -26,7 +26,7 @@@ from .bandcamp import BandcampIE, Bandc
  from .bbccouk import BBCCoUkIE
  from .beeg import BeegIE
  from .behindkink import BehindKinkIE
+ from .bild import BildIE
  from .bilibili import BiliBiliIE
  from .blinkx import BlinkxIE
  from .bliptv import BlipTVIE, BlipTVUserIE
@@@ -367,7 -368,6 +368,7 @@@ from .teachingchannel import TeachingCh
  from .teamcoco import TeamcocoIE
  from .techtalks import TechTalksIE
  from .ted import TEDIE
 +from .telecinco import TelecincoIE
  from .telemb import TeleMBIE
  from .tenplay import TenPlayIE
  from .testurl import TestURLIE