[pkg-opensc-commit] [libp11] 38/67: Merge branch 'master' into PKCS11_enumerate_public_keys

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit b1758cf0ac33c8a62d0fbc51e27db32d8dd2451e
Merge: b7e39db 32b42cf
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Tue Jan 5 17:14:32 2016 +0100

    Merge branch 'master' into PKCS11_enumerate_public_keys

 .travis.sh  | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 .travis.yml | 11 ++++++-----
 2 files changed, 57 insertions(+), 5 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git