From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 18 Feb 2009 00:37:49 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.05~41
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3df883ba94d7b06697ce15bed2058768bc8de006

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

3df883ba94d7b06697ce15bed2058768bc8de006