Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 25 Nov 2014 16:20:07 +0000 (11:20 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 25 Nov 2014 16:20:07 +0000 (11:20 -0500)
commitd95af00117175d4d348f9879d96f888645b3545b
tree4d9c0f4ab9b8ef13b4b005e6b97e144eb07bf53a
parent0818846d7cb3d3ecc3293cca76df406fbaf7b151
parentf9097d45c8de1134376b147a2195152800d99aaf
Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
libfreerdp/core/peer.c