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

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

83b9bf54ec85f7c1156983108f57c2b1af0e8fe5