Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Oct 2009 21:11:08 +0000 (17:11 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 5 Oct 2009 21:11:08 +0000 (17:11 -0400)
commit7ee7773e2acd97c81a20a877400e8126e981b424
treede1206ae40ad301a2ffed483c507511deb5ca495
parentba71687077f0acd902294f9081eff11f7e843532
parentbf10130165f2696666e273b5ea29348089496c1c
Merge branch 'master' into dependency-types