commit c7b7b9d6c5abad567f78f9177ceabf9d8222b43b Merge: 3c8c864 1626e8e Author: Jared K. Smith jaredsmith@jaredsmith.net Date: Mon Mar 31 08:09:39 2014 -0400

Merge branch 'yubikey_neo'

en-US/Security_Guide.xml | 18 +++++++---- en-US/Yubikey_Neo.xml | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 7 deletions(-) ---