Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 15 Dec 2014 20:55:51 +0000 (15:55 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 15 Dec 2014 20:55:51 +0000 (15:55 -0500)
commitf1bd547580bd9b800dd43533e20ee79012bc330f
treeb4b53b151f780740cf7ae2ba9ce18249f5363582
parent0d56e264387950c6bd73839509dea7f41eb9a0c0
parent65214b49b94e86ac0b692c99e5e623699e956891
Merge branch 'master' of github.com:FreeRDP/FreeRDP

Conflicts:
client/X11/xf_client.c
client/X11/xf_client.c