Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:26:16 +0000 (13:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:26:16 +0000 (13:26 -0700)
1  2 
Makefile

diff --cc Makefile
Simple merge