Merge branch 'master' of github.com:FreeRDP/FreeRDP into smartcard
authorawake <awake@ubuntu.(none)>
Wed, 16 Apr 2014 21:18:32 +0000 (14:18 -0700)
committerawake <awake@ubuntu.(none)>
Wed, 16 Apr 2014 21:18:32 +0000 (14:18 -0700)
commit64915c992b201219bd10d3fc62be3a7bc9e8285b
treec472a644eeaa3cf5c721ef7634b0b1d139a1d159
parent27281782111eb5c84cc6878422277ed0e6ca12d9
parentfae0c4a6e5f87b5a57ed985a354505bbda083f49
Merge branch 'master' of github.com:FreeRDP/FreeRDP into smartcard