Code

Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:47:44 +0000 (11:47 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:47:44 +0000 (11:47 +0100)
commit9622e4d30f90e9eefca1d43fefc6bf85785074d3
tree51635829f0d1ffb025d928a3d1f4b69f1ff8717a
parent6254a763a3103ee0d3a09726da53dfc8b3bc8dbc
parent0b4f63782617b308abf908fbb2fc7ec9afe039db
Merge branch 'collectd-4.8' into collectd-4.9