Merge branch 'ready/edittemplate2'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:54:13 +0000 (21:54 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:54:13 +0000 (21:54 +0100)

Trivial merge