Merge tag 'v2.11.3' into maint-2.12
authorJunio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 22:04:22 +0000 (15:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 22:04:22 +0000 (15:04 -0700)
Git 2.11.3

1  2 
cache.h
diff --cc cache.h
Simple merge