Merge branch 'jk/lib-proto-disable-cleanup' into maint-2.12
authorJunio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 22:03:21 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 22:03:21 +0000 (15:03 -0700)
Trivial merge