Merge branch 'fixes'
commitd6179f56f82252dca6443e736915a2cf45cdf9f3
authorJunio C Hamano <junkio@cox.net>
Fri, 23 Sep 2005 04:52:34 +0000 (22 21:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 23 Sep 2005 04:52:34 +0000 (22 21:52 -0700)
tree6b9632eb1d6756fdebebbaec9411e09e98495467
parent089f20dce19711d34f5383ee289a9b1fbd3f3307
parent2c08b3638339f9b73128c41a4882e115222608a3
Merge branch 'fixes'