Merge branch 'fixes'
commit2af60a0521a8d0514e8bb1ca371cc9d502ea1c58
authorJunio C Hamano <junkio@cox.net>
Mon, 10 Oct 2005 02:17:43 +0000 (9 19:17 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 10 Oct 2005 02:17:43 +0000 (9 19:17 -0700)
tree35ef8adb4a0d11f22aac2b9bd446f9df73420483
parent305a5c78bf4459c0aefb1b7d7b59ea53e2c4b036
parentfb8024b414b417d85ce215eba3dd23c188500c15
Merge branch 'fixes'
Makefile