From: Joey Hess Date: Sat, 15 Mar 2008 16:36:13 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.41~126 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91142c86adcbb2cddd0e3dc7a38afa8522624ad8;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- 91142c86adcbb2cddd0e3dc7a38afa8522624ad8