Code

Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 31 Mar 2010 13:16:32 +0000 (15:16 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 31 Mar 2010 13:16:32 +0000 (15:16 +0200)
commitc37551925a5dee2731413cd96e1d046528e694c5
treeaea6768c21f899b6df1a4f807a4654c8cb5e13a8
parent15cc454e20e4f34dc465f58e2eb9449d2c0b6746
parente428176dff22b00adf14fc082eee7fd7eb3ae040
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8