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

Merge branch 'master' into tova
---

4a8007d7c803746e11f76c555cbb9035b5f07bfe