projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e311b63 fab6d4c)
Merge remote-tracking branch 'jtwaleson/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Nov 2014 21:10:26 +0000 (22:10 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Nov 2014 21:10:26 +0000 (22:10 +0100)
1  2 
youtube_dl/extractor/youtube.py patch | diff1 | diff2 | blob | history

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