From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Jan 2017 21:34:59 +0000 (-0800)
Subject: Sync with maint
X-Git-Tag: v2.12.0-rc0~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f60064c1f538f06e1c579cbd9840b86b10bcd3d?hp=--cc

Sync with maint

* maint:
Ready for 2.11.1
---

8f60064c1f538f06e1c579cbd9840b86b10bcd3d