[gnome-keyring: 2/2] Merge branch 'mjog/reinstate-p11kit-module' into 'master'

[Daiki Ueno <dueno src gnome org>]

commit 2d03ae466eb3b02b74466b396624debddc377fcf
Merge: c897a163 a955ae82
Author: Daiki Ueno <ueno gnu org>
Date:   Sat Dec 29 15:35:14 2018 +0000

    Merge branch 'mjog/reinstate-p11kit-module' into 'master'
    
    Revert "pkcs11: Don't install p11-kit module configuration"
    
    Closes #20
    
    See merge request GNOME/gnome-keyring!7

 .gitignore                               | 3 +++
 configure.ac                             | 1 +
 pkcs11/rpc-layer/Makefile.am             | 5 +++++
 pkcs11/rpc-layer/gnome-keyring.module.in | 7 +++++++
 4 files changed, 16 insertions(+)
---