From: Joey Hess Date: Sun, 19 Aug 2012 00:56:40 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79414caf54ca1f3c126526595eab2d86616c9821;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 79414caf54ca1f3c126526595eab2d86616c9821