Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Jan 2010 09:32:01 +0000 (10:32 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Jan 2010 09:32:01 +0000 (10:32 +0100)
commit3dc81b33ff9f8ac56f4150b18cd6cd520d01a905
tree90e2a0d9e4f9763cbd5796976ec65b6c34ff14b9
parentd785e7983cefc75069d4de503f381d7558bcb0a6
parent6bed4b118be72ff649a4d7547bcc4dfffcd887f0
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8