Merge remote-tracking branch 'duncankl/airmozilla'

diff --combined youtube_dl/extractor/__init__.py
index 40fc92cf77c793ed3581ee5f179106dffb16d3b8,7e18643159e279ceba5accef252534c6fa876ec0..67dca82aea8b19d65f211c9f9979d416b9286ff1
--- 1/youtube_dl/extractor/__init__.py
--- 2/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,