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