diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-08-23 16:41:14 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-08-23 16:41:14 +0200 |
| commit | 00558d94145f97c644e66ec086fa9b9d8c58280f (patch) | |
| tree | 1a3ce73a88368cf628314deb40ea10e8c442cec6 /youtube_dl/__init__.py | |
| parent | 49f3c16543891425bb40bc5a5a13b626770c437d (diff) | |
| parent | ee1a7032d51757aceab806db707979203626e9ea (diff) | |
| download | youtube-dl-00558d94145f97c644e66ec086fa9b9d8c58280f.tar.xz | |
Merge remote-tracking branch 'sehrgut/Grooveshark'
Conflicts:
youtube_dl/__init__.py
youtube_dl/extractor/__init__.py
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index f156ba3a0..613ce3576 100644 --- 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' |