From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 25 Oct 2014 06:55:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'xavierbeynon/audiomack'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=7fc54e5262966370762ca7f186e9c709990b354d;p=youtube-dl

Merge remote-tracking branch 'xavierbeynon/audiomack'
---

7fc54e5262966370762ca7f186e9c709990b354d
diff --cc youtube_dl/__init__.py
index 59b851056,78cdf14df..4f5ce604f
--- a/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'