Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 6 Jul 2008 13:04:41 +0000 (15:04 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 6 Jul 2008 13:04:41 +0000 (15:04 +0200)
commita8d1499f57d3ffaff4c0ef3259a9fbf21b2953c5
tree18ffbf302e5f619c19153abba3bc31d70d35506b
parentf30d553f821b4c8f806bd294973561e635133e1a
parent7699c3ec722a9414f3342d6cd31b7be440a5da6f
Merge branch 'collectd-4.3' into collectd-4.4
src/collectd.conf.in
src/email.c
src/plugin.c
src/rrdtool.c