Merge remote-tracking branch 'xavierbeynon/audiomack'

diff --cc youtube_dl/__init__.py
index 59b8510563e7651d60abac526634970809979b2f,78cdf14dfa58b76f9891b37ca9d98bf5cb37f4cf..4f5ce604fc120afad246058bfabd15808ef338f0
--- 1/youtube_dl/__init__.py
--- 2/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@@ -79,9 -79,7 +79,10 @@@ __authors__  = 
      'Carlos Ramos',
      '5moufl',
      'lenaten',
 +    'Dennis Scheiba',
 +    'Damon Timm',
 +    'winwon',
+     'Xavier Beynon'
  )
  
  __license__ = 'Public Domain'

diff --cc youtube_dl/extractor/__init__.py
Simple merge