Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Tue, 17 Oct 2006 04:58:54 +0000 (21:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 17 Oct 2006 04:58:54 +0000 (21:58 -0700)
commit3453f862e1c74e400da67def9b810300ef90c3ac
treecccd112737f2cefd3841ea394c8c141913b3be7e
parentb32db4d0faec35ad8e6af35c54c37036b3d6c02f
parent9de0834663f28bee9e6b2c4647ed6128241ed26f
Merge branch 'maint'

* maint:
  Fix hash function in xdiff library