Sync with 1.8.5
authorJunio C Hamano <redacted>
Thu, 5 Dec 2013 22:11:11 +0000 (14:11 -0800)
committerJunio C Hamano <redacted>
Thu, 5 Dec 2013 22:11:20 +0000 (14:11 -0800)

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