From: Joey Hess Date: Wed, 5 May 2010 00:36:21 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100515~101 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e44ccca13c61bd9105ad3de24506523d8d9bdb93;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- e44ccca13c61bd9105ad3de24506523d8d9bdb93