Merge branch 'smartcard_fixes' of github.com:akallabeth/FreeRDP into smartcard_fixes
authorArmin Novak <anovak@thinstuff.com>
Tue, 24 Sep 2013 07:48:21 +0000 (09:48 +0200)
committerArmin Novak <anovak@thinstuff.com>
Tue, 24 Sep 2013 07:48:21 +0000 (09:48 +0200)
commit632800679b172486598117f21cd1da43d16f088b
tree04dc142c13388b829f1d9f9c148a0730a5ed0a7b
parent4d8c47ce924eb0e6d59c096f13e843dec9036a5d
parent1148a8c9fd91ebeaffcd4c295b5e4fc813c38381
Merge branch 'smartcard_fixes' of github.com:akallabeth/FreeRDP into smartcard_fixes

Conflicts:
channels/smartcard/client/smartcard_operations.c
channels/smartcard/client/smartcard_operations.c