From: Joey Hess Date: Wed, 19 Dec 2007 22:32:18 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.17~38 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9a40c8716afd6076c630a140186ee7b2ec9cfb4;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- e9a40c8716afd6076c630a140186ee7b2ec9cfb4