[Merge] lp:~roger.light/ubuntu/saucy/mosquitto/merge-debian-1.2 into lp:ubuntu/mosquitto

[Daniel Holbach]

Review: Needs Fixing

When I attempt the merge I get the following merge conflicts:
Text conflict in Makefile
Text conflict in client/Makefile
Text conflict in config.h
Text conflict in config.mk
Text conflict in mosquitto.conf
Text conflict in src/conf.c
Text conflict in src/read_handle_server.c
Text conflict in src/security.c

-- 
https://code.launchpad.net/~roger.light/ubuntu/saucy/mosquitto/merge-debian-1.2/+merge/181952
Your team Ubuntu branches is subscribed to branch lp:ubuntu/mosquitto.