From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Oct 2009 03:38:41 +0000 (-0400)
Subject: Merge branch 'master' into dependency-types
X-Git-Tag: 3.20091017~27^2~15
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4cce29259353223b1091a83e03748ae4b34b0796

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

4cce29259353223b1091a83e03748ae4b34b0796