From: Joey Hess Date: Fri, 10 Jun 2011 22:48:22 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=d86f248329b1702c5093e0bd8274c3bd3f059ba8 Merge branch 'master' of ssh://git.ikiwiki.info --- d86f248329b1702c5093e0bd8274c3bd3f059ba8