From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 22 Jul 2008 01:23:58 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Tag: 2.55~86
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9d5c9ce258299c4b495dfa11e652ee06df02053a

Merge branch 'master' into tova
---

9d5c9ce258299c4b495dfa11e652ee06df02053a