Merge branch 'dk/libsecret-unlock-to-load-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:05:02 +0000 (12:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:05:02 +0000 (12:05 +0900)
The credential helper for libsecret (in contrib/) has been improved
to allow possibly prompting the end user to unlock secrets that are
currently locked (otherwise the secrets may not be loaded).

* dk/libsecret-unlock-to-load-fix:
  credential-libsecret: unlock locked secrets


Trivial merge