Merge pull request #783 from mfournier/varnish4

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

Thu, 20 Nov 2014 07:53:58 +0000 (08:53 +0100)

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

Thu, 20 Nov 2014 07:53:58 +0000 (08:53 +0100)
author Marc Fournier <marc.fournier@camptocamp.com>
Thu, 20 Nov 2014 07:53:58 +0000 (08:53 +0100)
committer Marc Fournier <marc.fournier@camptocamp.com>
Thu, 20 Nov 2014 07:53:58 +0000 (08:53 +0100)
diff --cc configure.ac
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Thu, 20 Nov 2014 07:53:58 +0000 (08:53 +0100)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Thu, 20 Nov 2014 07:53:58 +0000 (08:53 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history