Merge remote-tracking branch 'sehrgut/Grooveshark'

Conflicts: youtube_dl/__init__.py youtube_dl/extractor/__init__.py
2014-08-23 16:41:14 +02:00
parent 49f3c16543 ee1a7032d5
commit 00558d9414
3 changed files with 207 additions and 0 deletions
--- a/youtube_dl/init.py
+++ b/youtube_dl/init.py
@@ -71,6 +71,7 @@ __authors__  = (
    'Sebastian Haas',
    'Alexander Kirk',
    'Erik Johnson',
+    'Keith Beckman',
 )

 __license__ = 'Public Domain'