From: Joey Hess Date: Fri, 28 Dec 2007 21:15:23 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.17~8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1bed8653606bdaa778e34fdf6b257b7e27f0598b;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- 1bed8653606bdaa778e34fdf6b257b7e27f0598b