From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 20 Jul 2013 09:23:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'yasoob/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=b390d85d95fd9031668f2ae61b3f5594f4d297a7;hp=-c

Merge remote-tracking branch 'yasoob/master'
---

b390d85d95fd9031668f2ae61b3f5594f4d297a7
diff --combined youtube_dl/extractor/__init__.py
index 749fa6558,70a2363e4..b4a1c20e9
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -19,6 -19,7 +19,7 @@@ from .dreisat import DreiSatI
  from .ehow import EHowIE
  from .eighttracks import EightTracksIE
  from .escapist import EscapistIE
+ from .exfm import ExfmIE
  from .facebook import FacebookIE
  from .flickr import FlickrIE
  from .freesound import FreesoundIE
@@@ -51,7 -52,6 +52,7 @@@ from .pornotube import PornotubeI
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
 +from .sina import SinaIE
  from .soundcloud import SoundcloudIE, SoundcloudSetIE
  from .spiegel import SpiegelIE
  from .stanfordoc import StanfordOpenClassroomIE
@@@ -71,9 -71,7 +72,9 @@@ from .veoh import VeohI
  from .vevo import VevoIE
  from .vimeo import VimeoIE
  from .vine import VineIE
 +from .c56 import C56IE
  from .wat import WatIE
 +from .weibo import WeiboIE
  from .wimp import WimpIE
  from .worldstarhiphop import WorldStarHipHopIE
  from .xhamster import XHamsterIE