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

[Maxim Burgerhout]

commit 2f11de41e9150518933bd91b349ff287dc015109
Merge: 81f9be9 509f7be
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date:   Thu Nov 28 16:36:33 2013 +0100

    Merge branch 'master' into el6

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