Merge branch 'fixes'
commit7fe2fc79358673a909d71e62d3f80ffe0f525fce
authorJunio C Hamano <junkio@cox.net>
Fri, 23 Sep 2005 07:53:43 +0000 (23 00:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 23 Sep 2005 07:53:43 +0000 (23 00:53 -0700)
treea424ef9dfccfb29709608315cfddd04bb7431299
parentd154dcc8b62ff609a0a3b271e1665c53df5c06a5
parent9f92f15f897fa1a943bcec324032cc4ca1f73ecf
Merge branch 'fixes'