commit | ab37a18b60b4f061de8239256589faeaab630ff8 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Fri May 05 12:52:26 2017 +0900 |
committer | Junio C Hamano <gitster@pobox.com> | Fri May 05 12:52:26 2017 +0900 |
tree | 75b21130d534219692c33fe36d646f4148d033b1 | |
parent | e46579643d56162299b1756b70d418005351b256 [diff] | |
parent | ac33201285cce4b392c3cedfaf7f098fdb1dde87 [diff] |
Merge branch 'maint-2.5' into maint-2.6