From: Joey Hess Date: Fri, 6 May 2011 18:31:59 +0000 (-0400) Subject: Merge remote-tracking branch 'jonas/master' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18322db430bf8799af69827d0c8359a3b747e9a9;p=ikiwiki.git Merge remote-tracking branch 'jonas/master' --- 18322db430bf8799af69827d0c8359a3b747e9a9