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

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

Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)

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

Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)
author Marc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)
committer Marc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)
diff --cc src/bind.c
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)
		1	2
src/bind.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history