projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33ec2ae 8fa8a62)
Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 1 Jan 2014 14:30:46 +0000 (15:30 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 1 Jan 2014 14:30:46 +0000 (15:30 +0100)
1  2 
youtube_dl/YoutubeDL.py patch | diff1 | diff2 | blob | history

diff --cc youtube_dl/YoutubeDL.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.