schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'sehrgut/Grooveshark'

Browse source 
Conflicts:
	youtube_dl/__init__.py
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister 2014-08-23 16:41:14 +02:00
commit 00558d9414
3 changed files with 207 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
youtube_dl/__init__.py
View file

@ -71,6 +71,7 @@ __authors__ = (
'Sebastian Haas',
'Alexander Kirk',
'Erik Johnson',
'Keith Beckman',
)
__license__ = 'Public Domain'