Merge branch 'collectd-3.11' into merge/collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 10 Feb 2007 10:30:18 +0000 (11:30 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 10 Feb 2007 10:30:18 +0000 (11:30 +0100)
commit79d36d9eb61ac09f253769feff144383b2b665c9
tree2e1c1c222f97e393f2c52118ec3c84d75b7e3aa9
parent72d61ac299b260918de0822691654558ffd4ca97
parent0e21a36c0efe84ffe74eac697435deaf7d3c1022
Merge branch 'collectd-3.11' into merge/collectd-4

Conflicts:

configure.in
src/processes.c
configure.in
src/Makefile.am
src/dns.c
src/processes.c