Merge branch 'collectd-4.4'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Jul 2008 15:12:21 +0000 (17:12 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Jul 2008 15:12:21 +0000 (17:12 +0200)
commit92445ff3363441d0f515de4a3ab92a504cfc0366
treecddef0b42e61293ad1770d392c026e343e37c7d4
parent765c149c2f753252f67a5575c1bddd3d3ee2b38f
parenta6124ab6c4ffcbbd1f57995b14e8d057f2c86f36
Merge branch 'collectd-4.4'

Conflicts:

src/snmp.c
src/collectd.h
src/configfile.c
src/ntpd.c
src/perl.c
src/snmp.c
src/vserver.c