Merge branch 'jk/archive-zip-userdiff-config' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:07 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:07 +0000 (13:32 -0800)
commitb1e4e17...2f13da2a5160b6f35fe383f1e08ad7b6
tree9fb21de...4a809ae3518ed42781e7d06a2408b843copy hash to clipboard (tree)
parent8103717...a59db996e05b98878359362ead6029f9copy hash to clipboard (diff)
parent965cba2...7ee9b272a35d66a11f0a7bf544aa727acopy hash to clipboard (diff)