Code

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


Trivial merge