Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 9 May 2014 19:45:10 +0000 (15:45 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 9 May 2014 19:45:10 +0000 (15:45 -0400)
commitbf39fc79b67511c8c5446844bcc10232a245ca11
tree9d89447302ddb7a3e7990d05a0b2a0ff5d4c298b
parentc1d727e9cd7b6ff67d9f7c5de4f623b22f3e4925
parentbbc9fc4393aa7d201a92c9f5d920440d1a77bd1b
Merge branch 'master' of github.com:awakecoding/FreeRDP