Merge branch 'collectd-4.9'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 18 Dec 2009 10:26:52 +0000 (11:26 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 18 Dec 2009 10:26:52 +0000 (11:26 +0100)
commiteeae8f7fd3b1bbad7fbcfef7bde35a7b20148c87
tree9e60e7593ccf4ab62e12d44274bd4eb8dcfc17ff
parentc7565f60af85bff6e04b52bed4703cf9ab35f3eb
parent557b23d4bc8eb6ca64eab72b2d768112486f5001
Merge branch 'collectd-4.9'