Sync with maint
authorJunio C Hamano <redacted>
Mon, 3 Jun 2013 20:00:03 +0000 (13:00 -0700)
committerJunio C Hamano <redacted>
Mon, 3 Jun 2013 20:00:09 +0000 (13:00 -0700)

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