From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 27 Jun 2013 16:16:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'gitprojs/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3a8736bd745ecd7ce5cb605cf56710f76a26d1ab;hp=-c;p=youtube-dl

Merge remote-tracking branch 'gitprojs/master'

Conflicts:
	youtube_dl/extractor/__init__.py
---

3a8736bd745ecd7ce5cb605cf56710f76a26d1ab
diff --combined youtube_dl/extractor/__init__.py
index cc818fcc1,03543c607..bffb6d115
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -1,6 -1,7 +1,7 @@@
  
  from .ard import ARDIE
  from .arte import ArteTvIE
+ from .auengine import AuengineIE
  from .bandcamp import BandcampIE
  from .bliptv import BlipTVIE, BlipTVUserIE
  from .breakcom import BreakIE
@@@ -18,7 -19,6 +19,7 @@@ from .gametrailers import GametrailersI
  from .generic import GenericIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 +from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
  from .hypem import HypemIE
  from .ina import InaIE
@@@ -137,7 -137,7 +138,8 @@@ def gen_extractors()
          TudouIE(),
          CSpanIE(),
          WimpIE(),
 +        HotNewHipHopIE(),
+         AuengineIE(),
          GenericIE()
      ]