Merge branch 'ready/templatebody'
authorSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:52:03 +0000 (21:52 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:52:03 +0000 (21:52 +0100)
commit7f5c2cfa5a987d887f42d6db95f80f42ceb3b5ff
tree020a296316b69b723511ff5b327815f81dce3d46
parent7660979f74f29560cd91220ade073d4ef2b9bcb0
parentc04a26f3e70d654ccec5542daf8425e44cb5bac8
Merge branch 'ready/templatebody'
IkiWiki.pm
doc/ikiwiki/directive/edittemplate.mdwn