Merge branch 'master' into next
commitc56cfa5dde233fbc2a459f8acd7743bae3060ba7
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2011 19:00:23 +0000 (24 11:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2011 19:00:23 +0000 (24 11:00 -0800)
tree52419852fb906949750fe084a26ab123bbc6bef2
parent844d7c9cf7c16e5c24acaab4a2e6c9fcca2ba996
parent630fc7878b6fd1bc188d4916b64f4df37658df96
Merge branch 'master' into next

* master:
  Git 1.7.4-rc3