From: Joey Hess Date: Wed, 31 Oct 2007 02:51:29 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.12~76 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=848af1f9060935e9aec4b3e843e8055bb8707140;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- 848af1f9060935e9aec4b3e843e8055bb8707140