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

Merge branch 'master' into autoconfig
---

b74b7ab68b983b3f7d9e561eb991b21764cdb3be