From: Joey Hess Date: Wed, 11 May 2011 18:52:20 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c71184c42622b79b88ab64919e16c642ccc4f34;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 0c71184c42622b79b88ab64919e16c642ccc4f34