From: Joey Hess Date: Sun, 22 Nov 2009 20:08:29 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091202~45 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aeaaeecd515748dfc044a5a5853426a35de70c94;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- aeaaeecd515748dfc044a5a5853426a35de70c94