Merge branch 'ra/anno' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 22 Feb 2006 10:07:20 +0000 (02:07 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 22 Feb 2006 10:07:20 +0000 (02:07 -0800)
commit52670c9730d7fffba8ef785c5cdefe9945d20ef7
treef0d56a5d33ae8a8d48a44b87865285dbd81a34a2
parenteb6b1cfccaacee5250f56a6027d67299e06d956b
parent4788d11a0d2ff872d25840768b2266e936a0b1fc
Merge branch 'ra/anno' into next

* ra/anno:
  Use Ryan's git-annotate instead of jsannotate