From: Joey Hess Date: Wed, 9 Jan 2008 19:35:11 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.20~12 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ed30330ac23ca84235e09cfc2f0acd55d62e4a09;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- ed30330ac23ca84235e09cfc2f0acd55d62e4a09