Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 09:51:23 +0000 (02:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 09:51:23 +0000 (02:51 -0700)
commit753fa210ccd603c204c562af2cf3ebd7d3a3047a
tree6144eab1eef7d860142dc029738cc73098cf3574
parenta796b895111d5f4a76be2365dbacef2e17d7d9c9
parentc07eee1f2ab9e9b168e050c0ef0b48d039c71470
Merge branch 'master' into next