From: Joey Hess Date: Sat, 23 Oct 2010 19:02:58 +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=9aaae1b2ded1cf90c570bfb5f8dc61c29f244d6f;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 9aaae1b2ded1cf90c570bfb5f8dc61c29f244d6f