Signed-off-by: Junio C Hamano <gitster@pobox.com>
Various fixes that have been cooking in 'next' have been merged. All of them should go to 'maint' for 1.8.1.1 later. Signed-off-by: Junio C Hamano <gitster@pobox.com>