From: Joey Hess Date: Sun, 3 Aug 2008 18:21:46 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 2.60~107 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=efcbb32f7c54ad8ffa2e56d52e651c18bd8be55a;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- efcbb32f7c54ad8ffa2e56d52e651c18bd8be55a