From: Joey Hess Date: Thu, 24 Jun 2010 00:30:47 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100704~30 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd7221ae5450e14e9641e01e0c2890a8f018ddb4;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- bd7221ae5450e14e9641e01e0c2890a8f018ddb4