[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 src/openldap.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3489284330462f4edc85a75445a5cc8014e29db0
Merge: 22b1f30 b842268
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Jun 17 15:03:18 2015 +0200

    Merge branch 'collectd-5.5'

commit b842268ca7212869d8b984e921c986309d427161
Author: Marek Becka <marek.becka at superhosting.cz>
Date:   Tue Jun 16 10:59:20 2015 -0400

    fix openldap segfatult when ldapi is used  v2

commit 0b68a27050ffbe8ce115d644fc572860b51b3707
Author: Marek Becka <marek.becka at superhosting.cz>
Date:   Thu Jun 11 13:52:41 2015 -0400

    fix openldap segfatult when ldapi is used