From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 7 Jul 2008 17:17:12 +0000 (-0400)
Subject: Merge branch 'master'
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/de468ba12dfc0891145b3f8b432eb97b70b60c0c?hp=--cc

Merge branch 'master'
---

de468ba12dfc0891145b3f8b432eb97b70b60c0c