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