Merge pull request #1509 from akallabeth/smartcard_fixes
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 25 Sep 2013 15:37:26 +0000 (08:37 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 25 Sep 2013 15:37:26 +0000 (08:37 -0700)
Smartcard fixes

1  2 
channels/smartcard/client/smartcard_main.c
client/common/cmdline.c

Simple merge