From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 25 Jul 2008 23:27:15 +0000 (-0400)
Subject: Merge branch 'master' into autoconfig
X-Git-Tag: 2.60~225
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0bd30824ec9c1f2af04d9e3d9b13473c8fcb9d8;p=ikiwiki.git

Merge branch 'master' into autoconfig
---

d0bd30824ec9c1f2af04d9e3d9b13473c8fcb9d8