Code

Merge remote-tracking branch 'origin/pr/993'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)
1  2 
src/bind.c
src/collectd.conf.pod

diff --cc src/bind.c
Simple merge
Simple merge