Merge branch 'master' into development

Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Klas Lindfors
2015-10-20 20:48:57 +02:00
11 changed files with 67 additions and 27 deletions
+1 -1
View File
@@ -27,7 +27,7 @@
option "verbose" v "Print more information" int optional default="0" argoptional
option "reader" r "Only use a matching reader" string optional default="Yubikey"
option "key" k "Authentication key to use" string optional default="010203040506070801020304050607080102030405060708"
option "key" k "Authentication key to use" string optional default="010203040506070801020304050607080102030405060708" argoptional
option "action" a "Action to take" values="version","generate","set-mgm-key",
"reset","pin-retries","import-key","import-certificate","set-chuid",
"request-certificate","verify-pin","change-pin","change-puk","unblock-pin",