From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 4 Jun 2008 15:30:59 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.49~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a0970423a72a6e687eeb79b660d7609f2539d7b8

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

a0970423a72a6e687eeb79b660d7609f2539d7b8