projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d475b33 dd7831f)
Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Mar 2015 02:01:28 +0000 (03:01 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Mar 2015 02:01:28 +0000 (03:01 +0100)
Conflicts:
youtube_dl/YoutubeDL.py


Trivial merge
Totally unverified clone of youtube-dl