Sync with maint
commitaa826b651ae3012d1039453b36ed6f1eab939ef9
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:41:50 +0000 (3 15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:41:50 +0000 (3 15:41 -0800)
tree03341b430fa2c5b5755cbf9feb635d3aacfd6751
parentc29024e5d1ad88cf45ef66b175966a0ba44a0490
parentfdca2bed90a7991f2a3afc6a463e45acb03487ac
Sync with maint