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

[Nick Bebout]

commit e3534842fb48b71a2c27919fed7acb474795f793
Merge: 15089cc c3d16a4
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Feb 15 15:27:10 2012 -0600

    Merge branch 'master' into el5

 .gitignore                |    1 +
 pam_yubico-pamuid_t.patch |   28 ++++++++++++++++++++++++++++
 pam_yubico.spec           |   10 ++++++++--
 sources                   |    2 +-
 4 files changed, 38 insertions(+), 3 deletions(-)
---