commit fca4c175bacdaccd6178f6419877f15a9b91e8ec Merge: 2817ecb 4f38f14 Author: Nick Bebout <nb at fedoraproject.org> Date: Thu Mar 13 19:12:36 2014 -0500 Merge branch 'el6' into el5 libyubikey.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---