From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 8 Apr 2008 16:52:48 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.42~26
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7c7dba8a71dd835fb53e7f24dc2dc6a2a3d8dfe1?ds=inline;hp=--cc

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

7c7dba8a71dd835fb53e7f24dc2dc6a2a3d8dfe1