From: Joey Hess Date: Fri, 20 Jul 2012 16:57:37 +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=7ec00df985f77eb7ebfe1640be67e1384fa98aa5 Merge branch 'master' of ssh://git.ikiwiki.info --- 7ec00df985f77eb7ebfe1640be67e1384fa98aa5