Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 12 Oct 2009 00:00:12 +0000 (20:00 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 12 Oct 2009 00:00:12 +0000 (20:00 -0400)
commita79e97e3f4bd6ac0b5f196782121938a92cfc1bf
tree779e1a351f8cf4977175ce1e691d9f654bf55a50
parent1f95e9b4d953ffdcb496bd9e995aefedc4a33f0e
parent99eec4f03de310b544ae727b3b28f14271ef3e30
Merge branch 'master' into dependency-types