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

Merge branch 'master' into autoconfig
---

4ef96e2d9994c407f0f2f46301eb91fab6b48a37