Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 17 Jun 2015 13:03:18 +0000 (15:03 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 17 Jun 2015 13:03:18 +0000 (15:03 +0200)
1  2 
src/openldap.c

diff --cc src/openldap.c
Simple merge