Merge commit 'tokkee/sh/collectd-4.9' into collectd-4.9
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:50:22 +0000 (11:50 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:50:22 +0000 (11:50 +0100)
commit3ae8778a363fc4383f1135ae99b389fad96978f3
treeb20e4e5fd943d15430a6de73e16ba0e27852322d
parent9622e4d30f90e9eefca1d43fefc6bf85785074d3
parent317653bcab477e3a2c3c42eeda9b7d0ab7b99bf1
Merge commit 'tokkee/sh/collectd-4.9' into collectd-4.9