Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 15 Mar 2006 17:12:18 +0000 (09:12 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 15 Mar 2006 17:12:18 +0000 (09:12 -0800)
commitd7da67148bd672b4e575da9b4e8cf509190f8491
treee2ee336cfa4c4175a1b5f787348bc8751b4a2c1d
parentd09a0a3cb862ead8bb7eec30439cb0eed41e91e3
parentc982647310fc5acd0bd6ebc408e70470447b387f
Merge branch 'master' into next

* master:
  Fix broken slot reuse when fetching alternates