Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Oct 2009 23:56:50 +0000 (19:56 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Oct 2009 23:56:50 +0000 (19:56 -0400)
commit1f95e9b4d953ffdcb496bd9e995aefedc4a33f0e
tree1b611f3a1d8d98c0b76ffcf1ddfda86621db0d14
parent51d889951528a1de4f631435c2deccd1bd326ec5
parent7adb471ff4ba0eddd18a858165d65c5dcb94090f
Merge branch 'master' into dependency-types