From: Marc-André Moreau Date: Sun, 6 Apr 2014 00:06:12 +0000 (-0400) Subject: Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard X-Git-Tag: 1.2.0-beta1+android7~74^2~53 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ff35d11ce0e900e3dd0d1012bc989b9bd2c93bd;p=platform%2Fupstream%2Ffreerdp.git Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard --- 7ff35d11ce0e900e3dd0d1012bc989b9bd2c93bd