projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56a94d8 877bea9)
Merge remote-tracking branch 'hojel/empflix'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 13 May 2014 08:11:14 +0000 (10:11 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 13 May 2014 08:11:14 +0000 (10:11 +0200)
1  2 
youtube_dl/extractor/__init__.py patch | diff1 | diff2 | blob | history

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