From: Joey Hess Date: Sun, 30 Dec 2007 19:49:54 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.17~2 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=d65b39fdcbd9e585f8149998fc7c95f8c0079d37 Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- d65b39fdcbd9e585f8149998fc7c95f8c0079d37