From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 23:56:50 +0000 (-0400)
Subject: Merge branch 'master' into dependency-types
X-Git-Tag: 3.20091017~27^2~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f95e9b4d953ffdcb496bd9e995aefedc4a33f0e;p=ikiwiki.git

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

1f95e9b4d953ffdcb496bd9e995aefedc4a33f0e