From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 27 Jul 2008 01:16:16 +0000 (-0400)
Subject: Merge branch 'master' into autoconfig
X-Git-Tag: 2.60~176
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3d82d47e1896b8e64c1e22b09a05968fc481aebf

Merge branch 'master' into autoconfig
---

3d82d47e1896b8e64c1e22b09a05968fc481aebf