Merge remote-tracking branch 'gitprojs/master'

Conflicts:
	youtube_dl/extractor/__init__.py

diff --cc youtube_dl/extractor/__init__.py
index cc818fcc1d4e330906ab44694dbb410aba746f04,03543c607e183ef9aeda04d5ac44102af7c53d7e..bffb6d115b15834a7bd88ed19e4e1a027a7888dd
--- 1/youtube_dl/extractor/__init__.py
--- 2/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()
      ]