From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 16 Oct 2008 16:53:33 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.67~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ee41aedb100415e6d5f99de5b0dedd686481e73c?ds=inline

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

ee41aedb100415e6d5f99de5b0dedd686481e73c