From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 1 Feb 2010 20:17:13 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100212~79
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4a1518cebafc1858393844eb348da963c9c6a3e5

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

4a1518cebafc1858393844eb348da963c9c6a3e5