From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 23 Jul 2008 21:34:01 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Tag: 2.55~60
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/96dab37a8e3acc58fb0ab5be0657c0e545e9684a?ds=inline;hp=96dab37a8e3acc58fb0ab5be0657c0e545e9684a

Merge branch 'master' into tova
---