Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 2 Aug 2009 10:22:20 +0000 (12:22 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 2 Aug 2009 10:22:20 +0000 (12:22 +0200)
commit38469fd7bce3b64857c711169c6289f16d8f0114
tree50cea78d00ae00c41e8d9e8a8344a6b74364be74
parent5e22694c513a35135c9155e410a49d83ad73302b
parentff607e9d1abc8f738b15626b5d30145d9a9f3f0d
Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6
contrib/collection3/etc/collection.conf