From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 30 May 2008 16:51:11 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.48~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4a3dc37eafeb45b82c0452cca8a1328e974a583c?ds=sidebyside;hp=--cc

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

4a3dc37eafeb45b82c0452cca8a1328e974a583c