Merge branch 'master' of github.com:FreeRDP/FreeRDP into cleanup
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 18 Sep 2012 23:41:39 +0000 (19:41 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 18 Sep 2012 23:41:39 +0000 (19:41 -0400)
1  2 
libfreerdp/core/transport.c

Simple merge