Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff
authorJunio C Hamano <junkio@cox.net>
Thu, 17 Nov 2005 10:00:25 +0000 (02:00 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 17 Nov 2005 10:00:25 +0000 (02:00 -0800)
commita575603af20a795584d79b32c30bda10fcae5d3f
tree8ff699dffc817e92fb2101f538f84c38d5ed0a0f
parentf30c95dd76800fbd66fb66180d67c09bab678282
parentfee3365fe13f36fdd432b1ede9980062cf744663
Merge branch 'tojunio' of locke.catalyst.net.nz/git/git-martinlanghoff