Merge remote-tracking branch 'sehrgut/Grooveshark'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 23 Aug 2014 14:41:14 +0000 (16:41 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 23 Aug 2014 14:41:14 +0000 (16:41 +0200)
commit00558d94145f97c644e66ec086fa9b9d8c58280f
tree1a3ce73a88368cf628314deb40ea10e8c442cec6
parent49f3c16543891425bb40bc5a5a13b626770c437d
parentee1a7032d51757aceab806db707979203626e9ea
Merge remote-tracking branch 'sehrgut/Grooveshark'

Conflicts:
youtube_dl/__init__.py
youtube_dl/extractor/__init__.py
youtube_dl/__init__.py
youtube_dl/extractor/__init__.py