Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.3

author Marc Fournier <marc.fournier@camptocamp.com>

Thu, 23 Jan 2014 13:18:08 +0000 (14:18 +0100)

committer Marc Fournier <marc.fournier@camptocamp.com>

Thu, 23 Jan 2014 13:18:08 +0000 (14:18 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Thu, 23 Jan 2014 13:18:08 +0000 (14:18 +0100)
committer Marc Fournier <marc.fournier@camptocamp.com>
Thu, 23 Jan 2014 13:18:08 +0000 (14:18 +0100)
diff --cc src/apache.c
Simple merge
diff --cc src/network.c
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Thu, 23 Jan 2014 13:18:08 +0000 (14:18 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Thu, 23 Jan 2014 13:18:08 +0000 (14:18 +0100)
		1	2
src/apache.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network.c	patch \|	diff1 \|	diff2 \|	blob \| history