projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ca2e11 9b330db)
Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 1 Sep 2014 21:13:49 +0000 (23:13 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 1 Sep 2014 21:13:49 +0000 (23:13 +0200)
Conflicts:
youtube_dl/extractor/eporner.py
youtube_dl/extractor/hornbunny.py


Trivial merge
Totally unverified clone of youtube-dl