From: Joey Hess Date: Wed, 14 Oct 2009 17:20:55 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091017~24 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77b0454e0c69fa0a3e3855b5f25322ae26b37042;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 77b0454e0c69fa0a3e3855b5f25322ae26b37042