Merge branch 'collectd-4.10' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 2 Apr 2015 21:05:23 +0000 (23:05 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 2 Apr 2015 21:05:23 +0000 (23:05 +0200)
1  2 
src/bind.c

diff --cc src/bind.c
Simple merge