Sync with maint
authorJunio C Hamano <redacted>
Mon, 14 May 2012 18:50:20 +0000 (11:50 -0700)
committerJunio C Hamano <redacted>
Mon, 14 May 2012 18:50:20 +0000 (11:50 -0700)

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