Merge remote-tracking branch 'gitprojs/master'

Conflicts:
	youtube_dl/extractor/__init__.py

diff --combined 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
@@@ -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()
      ]