From: Joey Hess Date: Sat, 5 Jan 2008 06:29:27 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.18~10 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f51e47d7f9b0dbc1fe8c356acadbf5ef2da227af;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- f51e47d7f9b0dbc1fe8c356acadbf5ef2da227af