Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 15:12:54 +0000 (17:12 +0200)
commit218635ab44a8533ef5b23fd1ae78be761ff0600c
treeaa68f1bbaf5b297b20ef9abf3215c9ea8e01b458
parent1641c82ec4e14968ea31021dfb8b520df5f4483a
parent30220fc97cad1717a2a3ce3ad03286ef1e6e29f3
Merge branch 'collectd-4.5' into collectd-4.6
src/ntpd.c
src/rrdtool.c