]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
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