Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Oct 2009 00:02:43 +0000 (20:02 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Oct 2009 00:02:43 +0000 (20:02 -0400)
commit76746c5fe6a8e851b971c8222a4929fe3be7f60a
tree1c1ccd6014f07e10384142b776b04bf2eee4c61c
parentc72fda7d695142cc29ac986125234140f6414d97
parent4528b95d2562831208d490ef378a089631000767
Merge branch 'master' into dependency-types