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

[Dennis Gilmore]

commit 311b1d8107cfd27e80494713bf350a0faaa8b104
Merge: 8268412 d158afa
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Nov 7 10:12:48 2011 -0600

    Merge branch 'master' into el5

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