Merge branch 'master' of https://github.com/mrthebunny/FreeRDP
authorBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 4 Apr 2014 14:09:00 +0000 (10:09 -0400)
committerBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 4 Apr 2014 14:09:00 +0000 (10:09 -0400)
1  2 
libfreerdp/core/transport.c

Simple merge