From: Joey Hess Date: Tue, 21 Feb 2012 17:34:13 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e6de25132d55add27432fdbfcda90fd7bc478b0a;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- e6de25132d55add27432fdbfcda90fd7bc478b0a