Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2011 01:34:00 +0000 (21:34 -0400)
committerFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2011 01:34:00 +0000 (21:34 -0400)
commitf538eec45e95ee6238754324e6d84d97108af540
tree0fedf5189616a04e3b70da9da78856c435eab954
parent95b08a826445423b00297d0db8cfb9676b5f676d
parent61fba41289decabc1a18c855fcd462fece9ab983
Merge branch 'collectd-5.0'