Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commit988859a927494bf12443f4e6fe8d2eb9ec9fe465
authorJakub Narebski <jnareb@gmail.com>
Tue, 17 Oct 2006 09:16:05 +0000 (17 11:16 +0200)
committerJakub Narebski <jnareb@gmail.com>
Tue, 17 Oct 2006 09:16:05 +0000 (17 11:16 +0200)
treecccd112737f2cefd3841ea394c8c141913b3be7e
parent1aa79f2a909abae7872cbbcba8efbbc8a5930d17
parent3453f862e1c74e400da67def9b810300ef90c3ac
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  Fix hash function in xdiff library