Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Apr 2007 19:56:43 +0000 (21:56 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Apr 2007 19:56:43 +0000 (21:56 +0200)
commit0a814175d5d4cebd2f2433603a7eba7cac496c0c
treead54422686b07d7ea7037b11eb84fe1eee6a572b
parent21ebca2d467304ebd3dc187d3ecdda6e5aff9d52
parent20d30b176dad6c969feb610777a8dfbb6dc04e70
Merge branch 'pull/collectd-4' into collectd-4