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

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

7ee7773e2acd97c81a20a877400e8126e981b424