projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fffd04 ae77739)
Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 2 Feb 2015 19:32:07 +0000 (20:32 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 2 Feb 2015 19:32:07 +0000 (20:32 +0100)
Conflicts:
youtube_dl/downloader/external.py


Trivial merge
Totally unverified clone of youtube-dl