From: Joey Hess Date: Thu, 6 Nov 2008 21:05:23 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 2.69~31 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72c03656f91db1e9eff1f9d8251c8baeffef10f7;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 72c03656f91db1e9eff1f9d8251c8baeffef10f7