Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Tue, 4 Oct 2005 02:13:04 +0000 (19:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 4 Oct 2005 02:13:04 +0000 (19:13 -0700)
commitd53174dbae060153176279f8b4797e3a35421c95
treec6ecca7cb0a161c759b419c17b729457ff0768c5
parentb23f02ee7aa3fc1cdaf6aebde9b731f22671251b
parentf5a5e9b9f4f08544660fd55cd211bdd57c55b32f
Merge branch 'fixes'