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