Merge branch 'collectd-5.5'

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 4 Mar 2016 11:19:47 +0000 (12:19 +0100)

committer Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 4 Mar 2016 11:19:47 +0000 (12:19 +0100)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 4 Mar 2016 11:19:47 +0000 (12:19 +0100)
committer Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 4 Mar 2016 11:19:47 +0000 (12:19 +0100)
diff --cc src/ceph.c
Simple merge
diff --cc src/daemon/plugin.c
Simple merge
diff --cc src/processes.c
Simple merge
diff --cc src/python.c
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 4 Mar 2016 11:19:47 +0000 (12:19 +0100)
committer	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 4 Mar 2016 11:19:47 +0000 (12:19 +0100)
		1	2
src/ceph.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/daemon/plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/processes.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/python.c	patch \|	diff1 \|	diff2 \|	blob \| history