projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bbf157 746c67d)
Merge remote-tracking branch 'naglis/wistia'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Sep 2014 00:03:49 +0000 (02:03 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 25 Sep 2014 00:03:49 +0000 (02:03 +0200)
1  2 
youtube_dl/extractor/generic.py patch | diff1 | diff2 | blob | history

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