From: Joey Hess Date: Fri, 16 Jul 2010 20:11:36 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100722~27 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a72193a81658e098fdafcd36b9bf20b4834d222e;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- a72193a81658e098fdafcd36b9bf20b4834d222e