From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Oct 2009 22:04:52 +0000 (-0400)
Subject: Merge branch 'master' into dependency-types
X-Git-Tag: 3.20091017~27^2~79
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1061d0094febfc21957554655a8eff4663b00ca;p=ikiwiki.git

Merge branch 'master' into dependency-types
---

d1061d0094febfc21957554655a8eff4663b00ca