From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Jan 2009 23:52:58 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.01~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/82182bb16eb28561a6c4ef22c9ad1e2f40b0ac3a

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

82182bb16eb28561a6c4ef22c9ad1e2f40b0ac3a