Sync with maint
authorJunio C Hamano <redacted>
Fri, 4 Dec 2015 19:39:56 +0000 (11:39 -0800)
committerJunio C Hamano <redacted>
Fri, 4 Dec 2015 19:39:56 +0000 (11:39 -0800)
* maint:
  Prepare for 2.6.4


Trivial merge
git clone https://git.99rst.org/PROJECT