From: Joey Hess Date: Mon, 5 Jul 2010 18:04:54 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100722~78 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/819e2a567aa8e528b95cc6e146d5ee92fd486cc8 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 819e2a567aa8e528b95cc6e146d5ee92fd486cc8