From: Joey Hess Date: Sun, 8 Apr 2012 18:17:29 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8cdbe23435d6a027d25c106c00ba34665fd54ed1;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 8cdbe23435d6a027d25c106c00ba34665fd54ed1