projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39c52bb abe70fa)
Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 4 Dec 2014 07:33:37 +0000 (08:33 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 4 Dec 2014 07:33:37 +0000 (08:33 +0100)
Conflicts:
youtube_dl/extractor/audiomack.py


Trivial merge
Totally unverified clone of youtube-dl