Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 08:59:19 +0000 (10:59 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 08:59:19 +0000 (10:59 +0200)
commit4d36d5826a3853ccd62195daf3b831d942850f1a
tree6a56408f57e987533795912dcf6d793496972818
parenta32caa9956625a5f27cc9a864caf050ade0b4ca9
parent540f2619a4d09fdb6ae465e8cc935c9dec4bcf70
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

configure.in
src/perl.c
configure.in
src/perl.c