projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 586a91b b028e96)
Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 Oct 2013 20:30:06 +0000 (22:30 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 22 Oct 2013 20:30:06 +0000 (22:30 +0200)
Conflicts:
youtube_dl/YoutubeDL.py

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.