From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Mon, 27 Jan 2014 11:45:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=e2ba07024f36b683d186a46d6c9542edb4e748b1;hp=-c;p=youtube-dl

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

e2ba07024f36b683d186a46d6c9542edb4e748b1
diff --combined youtube_dl/extractor/__init__.py
index 192baa9b8,b8d635c30..1e8556124
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -27,6 -27,7 +27,7 @@@ from .cbs import CBSI
  from .channel9 import Channel9IE
  from .cinemassacre import CinemassacreIE
  from .clipfish import ClipfishIE
+ from .cliphunter import CliphunterIE
  from .clipsyndicate import ClipsyndicateIE
  from .cmt import CMTIE
  from .cnn import CNNIE
@@@ -47,7 -48,6 +48,7 @@@ from .depositfiles import DepositFilesI
  from .dotsub import DotsubIE
  from .dreisat import DreiSatIE
  from .defense import DefenseGouvFrIE
 +from .discovery import DiscoveryIE
  from .dropbox import DropboxIE
  from .ebaumsworld import EbaumsWorldIE
  from .ehow import EHowIE