From: Joey Hess Date: Mon, 17 May 2010 19:42:44 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100518~9 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a5f0fc4931ab3635aac6bea600a68c8bb05156fc;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- a5f0fc4931ab3635aac6bea600a68c8bb05156fc