From: Joey Hess Date: Sun, 16 Dec 2007 20:50:41 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.16~28 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97a69be23663edfef828faa6f690f03db203e06b;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- 97a69be23663edfef828faa6f690f03db203e06b