Sync with Git 2.8.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:54:38 +0000 (10:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:54:38 +0000 (10:54 -0700)
Trivial merge