Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 21:04:25 +0000 (14:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 21:04:25 +0000 (14:04 -0700)
commitd62602e5ae9cbb781f6012323bb3921d979de3ea
treee7d63ad42a6c0f860b379278ecd165aab158f23e
parent6aa72195f5e02bd2714059f2cc93387d4c808abe
parent32c43f595f93cdd4ed5305aef97a3f6aaa74ed72
Merge branch 'master' into next

* master:
  Preparing for 2.12.1