Merge remote-tracking branch 'origin/rfxfix'
winpr-makecert: start implementing
makecert: accept more parameters
makecert: generate self-signed RDP certificate
Merge remote-tracking branch 'upstream/master' into compfix
Android: Fixed JNI regenerate script
Merge pull request #1088 from mfleisz/jniscript

Android: Fixed JNI regenerate script
iOS: Compile fixes (Fixed #1069, #1086)
iOS: Compile fix
Merge pull request #1089 from mfleisz/compfix

iOS: Compile fixes (Fixed #1069, #1086)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Merge pull request #1091 from awakecoding/master

winpr-makecert implementation
winpr-makecert: fix CMakeLists.txt
libfreerdp-core: separate TSG response parsing from receiving
winpr-makecert: fix linking against OpenSSL
winpr-makecert: fix OpenSSL applink error
winpr-makecert: only include OpenSSL's applink.c on Windows
Merge pull request #1092 from awakecoding/master

winpr-makecert fix
Merge pull request #2 from FreeRDP/master

iOS: Compile fixes