Merge branch 'collectd-5.6' into collectd-5.7

author Pavel Rochnyack <pavel2000@ngs.ru>

Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)

committer Pavel Rochnyack <pavel2000@ngs.ru>

Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)
author Pavel Rochnyack <pavel2000@ngs.ru>
Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)
committer Pavel Rochnyack <pavel2000@ngs.ru>
Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/memcached.c
Simple merge
author	Pavel Rochnyack <pavel2000@ngs.ru>
	Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)
committer	Pavel Rochnyack <pavel2000@ngs.ru>
	Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)
		1	2
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/memcached.c	patch \|	diff1 \|	diff2 \|	blob \| history