From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 29 Jan 2008 02:24:15 +0000 (-0500)
Subject: Merge branch 'master' into recentchanges
X-Git-Tag: 2.30~94
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0f95adbd1d33e267b9654c80ef2d38ca06407ecb

Merge branch 'master' into recentchanges
---

0f95adbd1d33e267b9654c80ef2d38ca06407ecb