From: Joey Hess Date: Tue, 29 May 2012 17:43:37 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73136f100f627e5982e06a2841e8cd086c38ef7f;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 73136f100f627e5982e06a2841e8cd086c38ef7f