Fixed compilation on windows (code was not standard C)
Merge pull request #1592 from akallabeth/sync_timed_fixes

Fixed broken timed wait for thread and mutex in WaitForSingleObject
Merge branch 'master' of github.com:mrthebunny/FreeRDP
Merge branch 'master' of github.com:FreeRDP/FreeRDP
winpr: fixed build warnings

* moved pthread_tryjoin_np to toplevel CMakeLists.txt
* removed duplicated -DHAVE_PTHREAD_GNU_EXT
winpr: disabled schannel test

not practicable for now since it requires local key setup
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Merge pull request #1596 from bmiklautz/pthread_ext

winpr: fixed build warnings
client/common: fixed TestClientRdpFile test

Unified ascii and unicode string handling.
Merge pull request #1597 from bmiklautz/tests

Fixed failing tests
Added script to automate gprof reporting.
Updated script to set up external android libraries.
Updated android build readme.
Updated readme.
android build: generate gprof file only if WITH_GPROF
android build: ignore renderscript toolchain

When detecting toolchains ignore renderscript because its not a
compiler toolchain.
Removed compilation warning
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Removed warning
libfreerdp-core: add external certificate management, pass X509 PEM certificate through client callback