Merge branch 'pull/collectd-4.1' into collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 28 Sep 2007 14:42:20 +0000 (16:42 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 28 Sep 2007 14:42:20 +0000 (16:42 +0200)
commitc7e5d54f1f0189d521eaab82f77842b41040b079
treebb3fafbb0fc9f1449589ffdb58e68ea463d47d1c
parent173e030dbc0abd872649185b5594fd340a2dde7d
parentaad06a384be9b35bebfb10c048ce01129e384a7e
Merge branch 'pull/collectd-4.1' into collectd-4.1