From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 13 Oct 2009 19:15:54 +0000 (-0400)
Subject: Merge branch 'dependency-types'
X-Git-Tag: 3.20091017~27
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ef7bddbc3693d7abf227100a9a9bc21d186dfada?ds=sidebyside;hp=--cc

Merge branch 'dependency-types'

Conflicts:
	doc/todo/dependency_types.mdwn
---

ef7bddbc3693d7abf227100a9a9bc21d186dfada