Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Tue, 4 Oct 2005 04:57:35 +0000 (21:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 4 Oct 2005 04:57:35 +0000 (21:57 -0700)
commit144c83f687e9c3020497662dfae47d03005a9e21
tree0df6901de45da7654ff7a8949b2e2f5f6c8a8b18
parente1d04f8aad59397cbd55e72bf8a1bd75606f5350
parent70a0c6fe39da7e3f68836051408bc8eb3ce60ba7
Merge branch 'fixes'