From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 26 Jul 2008 19:49:08 +0000 (-0400)
Subject: Merge branch 'master' into autoconfig
X-Git-Tag: 2.60~199
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cebbb6f482492ba776a1ca542e81a74fb74fbfce;p=ikiwiki.git

Merge branch 'master' into autoconfig
---

cebbb6f482492ba776a1ca542e81a74fb74fbfce