Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Dec 2005 22:00:47 +0000 (14:00 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Dec 2005 22:00:47 +0000 (14:00 -0800)
commit2a212746f44f18695d33931039da10f842de7b25
tree73e3445f380222ecb9d86290ec1118671a866c28
parent5d9d11db3c6768d67250b47391a944471bcd92c3
parent8ac4838af428a2a32498b3e8d13295eb714654b4
Merge branch 'fixes'