tree e887f3157fe315a40714bc76877a71a39824176a
parent f9039f30d56e3815eaab870d8b19c7b94aded8aa
parent eb777612f085fc42afd0ac6986ed8062f8b75cbd
parent 7f59dbbb8f8d479c1d31453eac06ec765436a780
author Junio C Hamano <junkio@cox.net> 1132358063 -0800
committer Junio C Hamano <junkio@cox.net> 1132358063 -0800

Merge branches 'jc/branch' and 'jc/rebase'