Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:48:31 +0000 (19:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:48:31 +0000 (19:48 -0800)
commitf3828dc0669826660f5034a468913115675ff501
tree899fc3974fa7526a717f77035396aba368a64ec7
parent5a90748f2856f587a948148a9b6fad50a43df57c
parent2808f6abc238ab038020681d43eaec7c0335efaa
Sync with maint