From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Dec 2015 19:39:56 +0000 (-0800)
Subject: Sync with maint
X-Git-Tag: v2.7.0-rc0~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e5da8655b23737a8449868e1d99973a8d0e25fe3

Sync with maint

* maint:
Prepare for 2.6.4
---

e5da8655b23737a8449868e1d99973a8d0e25fe3