From: Junio C Hamano <junkio@cox.net>
Date: Mon, 3 Jul 2006 10:14:32 +0000 (-0700)
Subject: Merge branch 'master' into js/merge-base
X-Git-Tag: v1.4.2-rc1~77^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f23c75a8eca5eeabf9aaf303ee7e14a94da42ddc?hp=f23c75a8eca5eeabf9aaf303ee7e14a94da42ddc

Merge branch 'master' into js/merge-base

This is to pull in the object-hash clean-up from the master branch.
---