Merge branch 'collectd-5.6'

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Wed, 26 Oct 2016 17:33:44 +0000 (19:33 +0200)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Wed, 26 Oct 2016 17:33:44 +0000 (19:33 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Wed, 26 Oct 2016 17:33:44 +0000 (19:33 +0200)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Wed, 26 Oct 2016 17:33:44 +0000 (19:33 +0200)
diff --cc src/daemon/common.c
Simple merge
diff --cc src/write_http.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Wed, 26 Oct 2016 17:33:44 +0000 (19:33 +0200)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Wed, 26 Oct 2016 17:33:44 +0000 (19:33 +0200)
		1	2
src/daemon/common.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/write_http.c	patch \|	diff1 \|	diff2 \|	blob \| history