Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 07:59:17 +0000 (08:59 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 07:59:17 +0000 (08:59 +0100)
commite628f39838a67b40d52dfb8425b4d8474fbd0550
tree77a1d6e11c42b5fde563940aa90a46a08c2ecd97
parentb6612126d862d182d9219e0512fa9ca833272b62
parent23164f56d04219d0dd1b1e4954c3edc0609f0eb8
Merge branch 'collectd-4.4' into collectd-4.5
ChangeLog
configure.in
src/apcups.c
src/configfile.c
src/mysql.c
src/utils_dns.c