Merge branch 'master' of github.com:awakecoding/FreeRDP into smartcard
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 24 Apr 2014 01:31:26 +0000 (21:31 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 24 Apr 2014 01:31:26 +0000 (21:31 -0400)
commitd6b0b1ae0e7d5f410a781c3bb6ac79f607846c71
tree67077224522eb77384dea59db675f5ee6eb648f7
parent64915c992b201219bd10d3fc62be3a7bc9e8285b
parente9653519fb78bede4b861e1e249d910eb8499d9d
Merge branch 'master' of github.com:awakecoding/FreeRDP into smartcard