sdfa
Msdferge branch 'master' of https://github.com/kulv2012/mosquitto

Conflicts:
	test/connection_keeper.c
	test/fake_user.c