projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0990305 bcc069a)
Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 25 Aug 2014 16:36:42 +0000 (18:36 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 25 Aug 2014 16:36:42 +0000 (18:36 +0200)
1  2 
youtube_dl/extractor/generic.py patch | diff1 | diff2 | blob | history

diff --cc youtube_dl/extractor/generic.py
Simple merge
Totally unverified clone of youtube-dl