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

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

76746c5fe6a8e851b971c8222a4929fe3be7f60a