[libyubikey/el6: 4/5] Merge branch 'master' into el6

[Maxim Burgerhout]

commit 4cd2d5f9151f08106ce7a566016eb942f6183d6f
Merge: 8abb6b1 573f880
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date:   Wed May 15 09:12:43 2013 +0200

    Merge branch 'master' into el6

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