From: Joey Hess <joey@kitenet.net>
Date: Fri, 4 Oct 2013 16:36:21 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140102~82
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2e3d535c6b71a1a4784525730803bb1c3c5403e8?hp=ffa5e046b68b49a5866b3768e3a9bf245fd5aa3d

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/debian/changelog b/debian/changelog
index cfcf8a3d9..97ddc4e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20130904.2) UNRELEASED; urgency=low
+
+  * aggregate: Improve display of post author.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 05 Sep 2013 10:01:10 -0400
+
 ikiwiki (3.20130904.1) unstable; urgency=low
 
   * Fix cookiejar default setting.
diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index a89ccfcdf..5a0f6e780 100644
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -12,7 +12,7 @@
 [[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
 </TMPL_IF>
 <TMPL_IF AUTHOR>
-[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>: <TMPL_VAR AUTHOR ESCAPE=HTML>"]]
+[[!meta author="<TMPL_VAR AUTHOR ESCAPE=HTML> (<TMPL_VAR NAME ESCAPE=HTML>)"]]
 <TMPL_ELSE>
 [[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
 </TMPL_IF>