Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 12 Oct 2009 02:39:31 +0000 (22:39 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 12 Oct 2009 02:39:31 +0000 (22:39 -0400)
commit85af97c9a2311bc6c2606e43aeaf83f7a30e0514
tree1e03ef773c51e4a65486817e0539cf790bbd7424
parente4c765c64fc31ab13c911b716e80b07b4d1a0037
parent33f42db2ea0422551223c255d85d9f4e45ee404b
Merge branch 'master' into dependency-types

Conflicts:
debian/changelog
debian/changelog