Merge branch 'dependency-types'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Oct 2009 19:15:54 +0000 (15:15 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 13 Oct 2009 19:15:54 +0000 (15:15 -0400)
commitef7bddbc3693d7abf227100a9a9bc21d186dfada
tree1072bb7d7c29375b9008b3021bc1d2049eeaecca
parentf6402d22caeecf481826b60791d84cb53210f686
parent046ac5fec5534e10b8e34b96014f936bb151d147
Merge branch 'dependency-types'

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