From: Joey Hess Date: Fri, 21 May 2010 17:47:18 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100610~76 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58283f22b755083fefa5509e58ca89fe35271f09;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 58283f22b755083fefa5509e58ca89fe35271f09