Merge remote-tracking branch 'origin/pr/925'

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

Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)

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

Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)
author Marc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)
committer Marc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)
diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/types.db
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history