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-Tag: 3.20110431~119 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0c71184c42622b79b88ab64919e16c642ccc4f34?ds=sidebyside;hp=0c71184c42622b79b88ab64919e16c642ccc4f34 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info ---