Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 5 May 2015 18:25:55 +0000 (14:25 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 5 May 2015 18:25:55 +0000 (14:25 -0400)
commit8ee097a8dda884a353852bd9926a2405f9a1fd34
treeeb39594a9ef9bd9a3b9f6c83ede35d250be09763
parent1de81c30a4ab516bee5e011bf49e39376d7d4aed
parentdbcc97260514d4a9fc742fda614bfee65e5011ee
Merge branch 'master' of github.com:awakecoding/FreeRDP