From: Joey Hess Date: Mon, 29 Nov 2010 16:06:26 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3672af973563dc13b4da56e3d8c58064b67edd7;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- a3672af973563dc13b4da56e3d8c58064b67edd7