Merge branch 'nb/gnome-keyring-build' into maint
commit1729853432011faa51a88ab9831dc9b382a6ee7e
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:40 +0000 (6 13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:40 +0000 (6 13:06 -0700)
tree4071ddc4d4bf5c788445e1db17fb72249871044b
parentc8b080af7108744299e26e8d38cb6587b933f9fc
parent3cddb008c15978ae81ff144e24303467076d200f
Merge branch 'nb/gnome-keyring-build' into maint

Build improvements for gnome-keyring (in contrib/)

* nb/gnome-keyring-build:
  gnome-keyring: Don't hard-code pkg-config executable