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

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

a79e97e3f4bd6ac0b5f196782121938a92cfc1bf