From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 7 Feb 2010 01:04:17 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100212~50
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ffc53c9f2c40a53d1b43243f51394a775159425a

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

ffc53c9f2c40a53d1b43243f51394a775159425a