From: Joey Hess Date: Mon, 15 Oct 2012 17:54:22 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6c7e1998669f4979a2f12bbdd6d74775d5946d2;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- c6c7e1998669f4979a2f12bbdd6d74775d5946d2