Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:19:43 +0000 (11:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:19:43 +0000 (11:19 -0800)
commit52b2e6be992c205cb0733e3ebb801082071a1449
treeff17fa20843a6bc36b4cf24b87572f08cc14daec
parent782ca8c44e176e8a00c2c824a98dbe6274167639
parent49e863b02ae177069ebe6c4bb3d0e14bef7ccf7a
Merge branch 'maint'

* maint:
  Prepare for 2.6.5