Sync with maint
authorJunio C Hamano <redacted>
Mon, 24 Sep 2012 19:50:36 +0000 (12:50 -0700)
committerJunio C Hamano <redacted>
Mon, 24 Sep 2012 19:50:36 +0000 (12:50 -0700)

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