projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 499bfcb 2461f79)
Merge branch 'cn-verification-proxy'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 3 Mar 2015 12:57:29 +0000 (13:57 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 3 Mar 2015 12:57:29 +0000 (13:57 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.