projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf3e3c5 38bd51b)
Merge branch 'ready/more-proxy-utf8-fail'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:42:36 +0000 (21:42 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:42:36 +0000 (21:42 +0100)

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