Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 00:20:45 +0000 (20:20 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Oct 2009 00:20:45 +0000 (20:20 -0400)
commit61977ac97bd05ce70f1b79a0ef4a7bc8f3204bc8
tree516c7e639e20dac2e2c4c04736a7d4995fcbdeea
parent77598dfa9fccb668345198ea169cf7cf00b9845e
parentd8607f5e73990e7802e03eef2065ebac102fbd2f
Merge branch 'master' into dependency-types

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