From: Joey Hess Date: Sat, 23 Oct 2010 20:33:29 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f301569496e7d4019f41c34be5f07b828952ba8;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 9f301569496e7d4019f41c34be5f07b828952ba8