Merge branch 'fixes'
commitcfd8aefd4babcca5adbb724fb213ea3c8b1153c8
authorJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 07:32:06 +0000 (25 00:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 07:32:06 +0000 (25 00:32 -0700)
tree4b7c511e6eed4bd02b075bbe80f0071d7cb41762
parent00d8bbd3c4bba72a6dfd48c2c0c9cbaa000f13c2
parentfbaf834de12efb43dea8d2679a040462e9d3d03d
Merge branch 'fixes'