Merge branch 'maint' to sync with 1.5.3.2 This is an evil merge that also updates the stale document links in Documentation/git.txt Signed-off-by: Junio C Hamano <gitster@pobox.com>