Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 14:52:12 +0000 (15:52 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 13 Jan 2010 14:52:12 +0000 (15:52 +0100)
commit6732ba07293bd05b9c2b0202f9307e50565c0f6b
treead30cc1e797767648f182aff7d53bedef5df3a03
parent33aeecfc2507da2619a5d6fbae18813b4bb42b25
parent75aa62d1e4fa19731f2a9182d6132d6d6feb90bc
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8