Merge branch 'master' of github.com:mrthebunny/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 15 Jul 2013 21:14:20 +0000 (17:14 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 15 Jul 2013 21:14:20 +0000 (17:14 -0400)
1  2 
client/common/client.c

Simple merge