From: Simon McVittie <smcv@debian.org>
Date: Fri, 12 Sep 2014 20:54:13 +0000 (+0100)
Subject: Merge branch 'ready/edittemplate2'
X-Git-Tag: 3.20140916~43
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/390f12a845e65e30ce3c189d62dc4ca8c637e3f0

Merge branch 'ready/edittemplate2'
---

390f12a845e65e30ce3c189d62dc4ca8c637e3f0