Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:50:20 +0000 (11:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:50:20 +0000 (11:50 -0700)
commit3f8acaae8a6a025339c413c663fc8f0d73f29665
tree84b769b427b90f29a13747c0a8eeabd4e5d64b34
parent8fbe0db4fce68ed8239742b14e9d77d45201870b
parent0b9f4b63a0c1ff351415a1f41dfcbc2461c65e74
Sync with maint