Merge branch 'collectd-5.7'

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)
diff --cc src/log_logstash.c
Simple merge
diff --cc src/logfile.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)
		1	2
src/log_logstash.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/logfile.c	patch \|	diff1 \|	diff2 \|	blob \| history