From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Oct 2009 00:37:09 +0000 (-0400)
Subject: Merge branch 'master' into dependency-types
X-Git-Tag: 3.20091017~27^2~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d3e0a54344a8ca5ac0a30af9f0a41cdb08df06ff;p=ikiwiki.git

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

d3e0a54344a8ca5ac0a30af9f0a41cdb08df06ff