From: Joey Hess Date: Thu, 23 Jun 2011 21:42:48 +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=09c70360f5b25bba38f94b4a457ffd54941a1874 Merge branch 'master' of ssh://git.ikiwiki.info --- 09c70360f5b25bba38f94b4a457ffd54941a1874