Code

Merge branches 'jc/sb' and 'jc/mb'
authorJunio C Hamano <junkio@cox.net>
Fri, 11 Nov 2005 18:52:59 +0000 (10:52 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 11 Nov 2005 18:52:59 +0000 (10:52 -0800)
commit631ba3090714a9786457dd39da8ed50925715432
tree3119b68e566c36f5a137d8dbbe217892418eb1d3
parent592ee97d8fffa2318960074057e044709163abf7
parent4bc51db0feb4a93a285d6333f206cad77c83ed57
parent53de71f88b0d5a55892c19b412688548f5797f0b
Merge branches 'jc/sb' and 'jc/mb'