From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 6 Jul 2008 21:34:30 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Tag: 2.52~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/17fdb8028bfb2722c120b229c2131598affbddd6

Merge branch 'master' into tova
---

17fdb8028bfb2722c120b229c2131598affbddd6