Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 6 Apr 2014 00:06:12 +0000 (20:06 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 6 Apr 2014 00:06:12 +0000 (20:06 -0400)
commit7ff35d11ce0e900e3dd0d1012bc989b9bd2c93bd
treedb721d8f0b323a2dd2778032ea3726f3e0828b68
parent7324ded7a26384817c8086f047c85a17fb9c6c2e
parent368486dd13274ba8b0b1c1517a1c0fbba9cf4f78
Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard