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

Merge branch 'master' into transitive-dependencies
---

66a7b49acb06e0e9b3d0b31d087202d3c81d85e9