From: Joey Hess Date: Wed, 7 Dec 2011 18:56:30 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97363d7e9a0f3daa71ee6a54f8325386f9617a7f;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 97363d7e9a0f3daa71ee6a54f8325386f9617a7f