Sync with 2.6.5
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Jan 2016 22:06:59 +0000 (14:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Jan 2016 22:06:59 +0000 (14:06 -0800)
Trivial merge