Sync with 2.3.1
authorJunio C Hamano <redacted>
Wed, 25 Feb 2015 06:15:49 +0000 (22:15 -0800)
committerJunio C Hamano <redacted>
Wed, 25 Feb 2015 06:15:49 +0000 (22:15 -0800)

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