From: Joey Hess Date: Sat, 6 Aug 2011 16:31:23 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=556d2100e7a5d2fd594bdb12e717b628e909d11a;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 556d2100e7a5d2fd594bdb12e717b628e909d11a