OSDN Git Service

Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Oct 2015 22:29:57 +0000 (15:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Oct 2015 22:29:57 +0000 (15:29 -0700)
* maint:


Trivial merge