From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 1 Oct 2008 18:30:08 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Tag: 2.66~34^2~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/82eac2d04eb9a3a2e52972a0219606ac292ee3b9

Merge branch 'master' into tova
---

82eac2d04eb9a3a2e52972a0219606ac292ee3b9