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

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

d5357374c9def3cee23d46595f61795e08f4cc0b