From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 26 Feb 2015 00:15:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'duncankl/airmozilla'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=cd5b4b0bc2876e16656d33156754ce3c05aa1619;hp=-c

Merge remote-tracking branch 'duncankl/airmozilla'
---

cd5b4b0bc2876e16656d33156754ce3c05aa1619
diff --combined youtube_dl/extractor/__init__.py
index 40fc92cf7,7e1864315..67dca82ae
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -8,6 -8,7 +8,7 @@@ from .adobetv import AdobeTVI
  from .adultswim import AdultSwimIE
  from .aftenposten import AftenpostenIE
  from .aftonbladet import AftonbladetIE
+ from .airmozilla import AirMozillaIE
  from .aljazeera import AlJazeeraIE
  from .alphaporno import AlphaPornoIE
  from .anitube import AnitubeIE
@@@ -63,10 -64,6 +64,10 @@@ from .ccc import CCCI
  from .ceskatelevize import CeskaTelevizeIE
  from .channel9 import Channel9IE
  from .chilloutzone import ChilloutzoneIE
 +from .chirbit import (
 +    ChirbitIE,
 +    ChirbitProfileIE,
 +)
  from .cinchcast import CinchcastIE
  from .clipfish import ClipfishIE
  from .cliphunter import CliphunterIE
@@@ -368,7 -365,6 +369,7 @@@ from .promptfile import PromptFileI
  from .prosiebensat1 import ProSiebenSat1IE
  from .pyvideo import PyvideoIE
  from .quickvid import QuickVidIE
 +from .r7 import R7IE
  from .radiode import RadioDeIE
  from .radiobremen import RadioBremenIE
  from .radiofrance import RadioFranceIE
@@@ -429,10 -425,7 +430,10 @@@ from .soundcloud import 
      SoundcloudUserIE,
      SoundcloudPlaylistIE
  )
 -from .soundgasm import SoundgasmIE
 +from .soundgasm import (
 +    SoundgasmIE,
 +    SoundgasmProfileIE
 +)
  from .southpark import (
      SouthParkIE,
      SouthparkDeIE,