Merge branch 'nb/gnome-keyring-build'
commit880c267a2400d9374d7ca4501313e5ab9f5392fb
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:50 +0000 (27 09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:51 +0000 (27 09:56 -0700)
tree8f670afbf0568d9932cbda3217c585b68972a08a
parent2a5618ec78c5689295fa7feae590823df606f3b3
parent3cddb008c15978ae81ff144e24303467076d200f
Merge branch 'nb/gnome-keyring-build'

Build improvements for gnome-keyring (in contrib/)

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