From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 2 Jul 2008 20:38:13 +0000 (-0400)
Subject: Merge branch 'tova'
X-Git-Tag: 2.52~14
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c987aee47acfcc0df4c1ac2667d9c63133e99d2b?ds=inline

Merge branch 'tova'
---

c987aee47acfcc0df4c1ac2667d9c63133e99d2b