From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 20 Mar 2009 20:34:49 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.09~65
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ee973d0b460044769328b30067d1d7ca24a5a228?hp=--cc

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

ee973d0b460044769328b30067d1d7ca24a5a228