[pam_yubico/el6: 4/4] Merge branch 'master' into el6

[Dennis Gilmore]

commit cf8a57640e4abf6caaab689c86720bcf33ab5d10
Merge: 9c1415e d158afa
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Nov 7 10:13:01 2011 -0600

    Merge branch 'master' into el6

 .gitignore      |    1 +
 pam_yubico.spec |   14 ++++++++++++--
 sources         |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---