From: Joey Hess Date: Fri, 19 Feb 2010 18:31:37 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100302~30 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75baac425b6640ccff9f6d4b3340e07aff972b3d;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 75baac425b6640ccff9f6d4b3340e07aff972b3d