[pkcs11-helper/el6: 16/16] Merge branch 'epel7' into el6

[Jon Ciesla]

commit d5d3175c5cc7a20694c6a32e7c716c3ced8c6250
Merge: f6ade40 fae1e77
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Dec 2 12:48:19 2014 -0600

    Merge branch 'epel7' into el6
    
    Conflicts:
    	.gitignore
    	pkcs11-helper.spec

 pkcs11-helper.spec |   50 ++++++++++++++++++++++++++++++++++++++------------
 sources            |    2 +-
 2 files changed, 39 insertions(+), 13 deletions(-)
---