From: Joey Hess Date: Sun, 10 Feb 2008 17:21:49 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.40~136 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=196d27cbbc868f82ce9e598b0d7d1a8c460a52c6;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- 196d27cbbc868f82ce9e598b0d7d1a8c460a52c6