From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 1 Oct 2008 19:54:10 +0000 (-0400)
Subject: Merge branch 'tova'
X-Git-Tag: 2.66~34
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/18b1c7f01256ec7761263fb699aa51ae9d92bc0b

Merge branch 'tova'
---

18b1c7f01256ec7761263fb699aa51ae9d92bc0b