From: Joey Hess Date: Wed, 23 Nov 2011 20:55:20 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=4580662795788b83107d20943c77c7d4a6136a0a Merge branch 'master' of ssh://git.ikiwiki.info --- 4580662795788b83107d20943c77c7d4a6136a0a