Code

Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 20 Dec 2008 09:17:26 +0000 (10:17 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 20 Dec 2008 09:17:26 +0000 (10:17 +0100)
commit074b4980bc75bea6826e6a38dcc6e193a721b2a8
tree5f136359d2ebce6eba0ea91697f73199d194b332
parent5d7d1a7ee2aec05639398e6d93e998ae418d0065
parentf5edd182195cb7a13fa32846ae869a8b8dcc1e3f
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

src/utils_dns.c
src/collectd.c
src/collectd.conf.in
src/collectd.conf.pod
src/common.c
src/email.c
src/ipmi.c
src/rrdtool.c
src/unixsock.c
src/utils_dns.c