Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 18 Aug 2014 20:23:45 +0000 (16:23 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 18 Aug 2014 20:23:45 +0000 (16:23 -0400)
commit5e177118aac6ccdde658ff697f70f1c06b3a1318
tree21d7f7037ae22da69cef4a41b0f9ae07d2d6fbc0
parent168d46f2532c8cdae83a2799a19bcf2556d597fa
parent82a53057a1d7b88930ab001249a21a4af05cb81e
Merge branch 'master' of github.com:FreeRDP/FreeRDP