From: Simon McVittie <smcv@debian.org>
Date: Fri, 12 Sep 2014 20:42:36 +0000 (+0100)
Subject: Merge branch 'ready/more-proxy-utf8-fail'
X-Git-Tag: 3.20140916~47
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1a785a311e8dfa3de88bb36410b8a3a817b9b533

Merge branch 'ready/more-proxy-utf8-fail'
---

1a785a311e8dfa3de88bb36410b8a3a817b9b533