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/?a=commitdiff_plain;h=3a8736bd745ecd7ce5cb605cf56710f76a26d1ab;p=youtube-dl

Merge remote-tracking branch 'gitprojs/master'

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

3a8736bd745ecd7ce5cb605cf56710f76a26d1ab
diff --cc youtube_dl/extractor/__init__.py
index cc818fcc1,03543c607..bffb6d115
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -137,7 -137,7 +138,8 @@@ def gen_extractors()
          TudouIE(),
          CSpanIE(),
          WimpIE(),
 +        HotNewHipHopIE(),
+         AuengineIE(),
          GenericIE()
      ]