From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Aug 2008 18:21:46 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.60~107
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/efcbb32f7c54ad8ffa2e56d52e651c18bd8be55a

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

efcbb32f7c54ad8ffa2e56d52e651c18bd8be55a