Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 10 Jan 2008 08:48:52 +0000 (09:48 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 10 Jan 2008 08:48:52 +0000 (09:48 +0100)
commit225494e854ddaa1c0570ac9a5fa15380b333a919
tree86a3300a27e5bb682a5fb51bf4456f49319808a1
parent4d3df62c2da0ac48723cab5089a84e85938b9d97
parent79f871e0c04262f4769d23324236ce75d0b04d3f
Merge branch 'collectd-4.1' into collectd-4.2
src/collectd.conf.pod
src/configfile.c