Sync with maint
authorJunio C Hamano <redacted>
Wed, 29 May 2013 22:21:47 +0000 (15:21 -0700)
committerJunio C Hamano <redacted>
Wed, 29 May 2013 22:21:47 +0000 (15:21 -0700)
Signed-off-by: Junio C Hamano <redacted>

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