Conflicts:
	src/MQTTAsync.c
	src/MQTTClient.c
	src/MQTTClient.h
	src/SSLSocket.c
	src/SSLSocket.h

Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>

Conflicts:
	CMakeLists.txt
	README.md

Proposal for non-SSL version error. Issue #251

Compile static ssl libraries with OPENSSL=1

Extend the willOptions initializer to include the new binary payload fields

Merge branch 'testcase-for-issue-190-without-serverURI' of https://github.com/JuergenKosel/paho.mqtt.c into fixes

Non-SSL version of the library report an error if the caller requests an SSL connection. Possible soluiton for Issue #251

Explicitly enable OPENSSL=1 for the static ssl enabled libraries.
Otherwise a linker error is generated when using the libraries.
Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>

Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>

Merge branch 'regression-check-vs-uncover-issue' of https://github.com/JuergenKosel/paho.mqtt.c into fixes

Proposed patch: simplify handling of thread libraries on Unix-like OSes

Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>

Test5-2d has been added. So the corresponding label needs to be added
to the cmake file.
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>

- Reduce the number of iterations to 20 (It usually fails in iteration 3)
- Reduce the timeout by factor 10
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>