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

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

ff2aa982c3af4aede9ff0fdeafc617e0d3b15392