Merge pull request #3156 from akallabeth/ssl_wrapper_merge
authorHardening <rdp.effort@gmail.com>
Fri, 26 Feb 2016 08:52:43 +0000 (09:52 +0100)
committerHardening <rdp.effort@gmail.com>
Fri, 26 Feb 2016 08:52:43 +0000 (09:52 +0100)
Ssl wrapper merge

1  2 
libfreerdp/core/info.c
libfreerdp/core/rdp.c

Simple merge
Simple merge