Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 6 May 2009 08:44:00 +0000 (10:44 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 6 May 2009 08:44:00 +0000 (10:44 +0200)
commita2bf02b4f5bf4a22395b57bba6715dada3859612
treefacb67e74468dce7aaa10aa95645a96c4e68906c
parent139dd00301131050db32bf0cb08333aa7440c817
parenta1ae4b5afaf3207a7070b85f802b41b32c0b9a20
Merge branch 'collectd-4.6' into collectd-4.7