Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 3 Jun 2016 10:56:53 +0000 (12:56 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 3 Jun 2016 10:56:53 +0000 (12:56 +0200)
Conflicts:
src/perl.c

1  2 
src/perl.c

diff --cc src/perl.c
Simple merge