Merge branch 'master' into next
commit0a40cdcf4988158212598aa5f263582969eefb20
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Jun 2011 21:13:24 +0000 (1 14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Jun 2011 21:13:24 +0000 (1 14:13 -0700)
tree25906c85a3f3713c8108d495c0671af8c964c81f
parent1dff92d3ec7495803f594a4b47d1663bac6d103a
parenta6605d76cdad37ed3c55a7be4d2e0af0f4721bb2
Merge branch 'master' into next

* master:
  Git 1.7.5.4
  diffcore-rename.c: avoid set-but-not-used warning