Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 18 Nov 2014 19:21:55 +0000 (14:21 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 18 Nov 2014 19:21:55 +0000 (14:21 -0500)
commitab9a4318c85e39bd714791d116d15e51c1e7df70
treed261a83a5f016475e633ec160922ea2f8a51e4d9
parent4fbec7633a76ddafb61a72f9ead7d7b25dbf91fa
parent8a5ded36e6e38f9ef1703eedeeb536a3f016f9bf
Merge branch 'master' of github.com:FreeRDP/FreeRDP