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)
commit6600bd1351bf81e0831e7ad95ee37a7b28cbdf94
treeab492e4b6874e0dd02f7cef3dbcc4255d7b13687
parent662b30239376449f97abad874e46b5a3acdb7e5c
parent22651d8d4dc49e24bbac2cd34e0642dcf3639c97
Merge branch 'collectd-5.5'

Conflicts:
src/perl.c
src/perl.c