Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 08:26:28 +0000 (10:26 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 08:26:28 +0000 (10:26 +0200)
commit9d5a7847b03d78a94b6a0b153abeb630b4b94ddd
tree4569e799998cb06753d47173be32b545141e1069
parent3da24ea8c48268a64025dc4aae5bdf223d7dad0c
parentf05e9721b9ea58d6ea4a8295a80cede2d6b327d1
Merge branch 'collectd-4.2' into collectd-4.3
src/collectd.c