[Merge] lp:~roger.light/ubuntu/vivid/mosquitto/fix-for-1423037 into lp:ubuntu/mosquitto

[Daniel Holbach]

Review: Needs Fixing

Text conflict in client/Makefile
Text conflict in config.mk
Text conflict in lib/Makefile
Text conflict in lib/cpp/Makefile
Text conflict in src/Makefile
Conflict adding file src/uthash.h.  Moved existing file to src/uthash.h.moved.
Text conflict in test/lib/Makefile

-- 
https://code.launchpad.net/~roger.light/ubuntu/vivid/mosquitto/fix-for-1423037/+merge/250088
Your team Ubuntu branches is subscribed to branch lp:ubuntu/mosquitto.