From: Sergey M․ <dstftw@gmail.com>
Date: Wed, 16 Jul 2014 13:55:38 +0000 (+0700)
Subject: Merge branch 'cracked' of https://github.com/hassaanaliw/youtube-dl into hassaanaliw... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2f97f7687710f29cb0e101dd7bb3e0e41c73c9b4;hp=-c;p=youtube-dl

Merge branch 'cracked' of https://github.com/hassaanaliw/youtube-dl into hassaanaliw-cracked
---

2f97f7687710f29cb0e101dd7bb3e0e41c73c9b4
diff --combined youtube_dl/extractor/__init__.py
index c5961cab9,78b95c2a5..ca372496a
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -52,6 -52,7 +52,7 @@@ from .cnn import 
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
  from .condenast import CondeNastIE
+ from .cracked import CrackedIE
  from .criterion import CriterionIE
  from .crunchyroll import CrunchyrollIE
  from .cspan import CSpanIE
@@@ -170,7 -171,6 +171,7 @@@ from .metacafe import MetacafeI
  from .metacritic import MetacriticIE
  from .mit import TechTVMITIE, MITIE, OCWMITIE
  from .mixcloud import MixcloudIE
 +from .mlb import MLBIE
  from .mpora import MporaIE
  from .mofosex import MofosexIE
  from .mooshare import MooshareIE
@@@ -397,6 -397,7 +398,7 @@@ from .youtube import 
      YoutubeUserIE,
      YoutubeWatchLaterIE,
  )
+ 
  from .zdf import ZDFIE