projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f5ac90 de282fc)
Merge branch 'master' of github.com:rg3/youtube-dl
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 18:47:03 +0000 (20:47 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 18:47:03 +0000 (20:47 +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