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

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

b6b7dc3a43266515822c31b177bfd26e8d59f359