[libyubikey/el6: 3/3] Merge branch 'master' into el6

[Maxim Burgerhout]

commit 8abb6b131487cf6ab02652793defc25b4642c596
Merge: 2cb1ccd aa2aef6
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date:   Mon Oct 1 12:01:08 2012 +0200

    Merge branch 'master' into el6

 .gitignore      |    1 +
 libyubikey.spec |   15 +++++++++++----
 sources         |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---