From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 2 Jul 2008 22:23:44 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Tag: 2.52~4
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/abf9f16f09da1b494856a1803f848ed51f10fdb8

Merge branch 'master' into tova
---

abf9f16f09da1b494856a1803f848ed51f10fdb8