From: Joey Hess Date: Mon, 30 Aug 2010 17:03:08 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100831~46 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af1e2e6420e9f4d54d0b8cd4d9636ead1d8acde8;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- af1e2e6420e9f4d54d0b8cd4d9636ead1d8acde8