Merge branches 'jc/branch' and 'jc/rebase'
commit0b4276931f4130e93f393cb8b9fa0ce2138f1d9c
authorJunio C Hamano <junkio@cox.net>
Fri, 18 Nov 2005 23:54:23 +0000 (18 15:54 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 18 Nov 2005 23:54:23 +0000 (18 15:54 -0800)
treee887f3157fe315a40714bc76877a71a39824176a
parentf9039f30d56e3815eaab870d8b19c7b94aded8aa
parenteb777612f085fc42afd0ac6986ed8062f8b75cbd
parent7f59dbbb8f8d479c1d31453eac06ec765436a780
Merge branches 'jc/branch' and 'jc/rebase'