Merge branch 'winpr' of github.com:FreeRDP/FreeRDP into winpr
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 28 Jul 2012 23:31:26 +0000 (19:31 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 28 Jul 2012 23:31:26 +0000 (19:31 -0400)
commit7f5d88c0da511c6f360fde32ede4c657354aa6d7
tree9689c25bf55a02231c1fa14191066c0b18c94476
parentd1322c756ee9ad221d69338f40ed25e313ad0a86
parent1d93dbab339cd6bc3c4a29665606a6c27e9b1449
Merge branch 'winpr' of github.com:FreeRDP/FreeRDP into winpr