From: Simon McVittie Date: Tue, 15 Jul 2008 00:27:17 +0000 (+0100) Subject: Merge commit 'origin/master' X-Git-Tag: 2.54~87^2~2 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2df8696b5f234095a89182e53279fb6c61258711?hp=6ebea774c85502377681165e27093a3bd3a61f30 Merge commit 'origin/master' --- diff --git a/templates/page.tmpl b/templates/page.tmpl index d39c9aa2a..f2f9c34cc 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -20,11 +20,15 @@