From: Joey Hess Date: Fri, 15 Aug 2008 01:13:19 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 2.61^0 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=96f5bdb2d8891810e0011284da706aabecc00349;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 96f5bdb2d8891810e0011284da706aabecc00349