Merge branch 'collectd-4.8'
authorFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 09:36:17 +0000 (11:36 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 09:36:17 +0000 (11:36 +0200)
commit125e5cc99a45773dc7559e5478564fbc52f16623
tree073e4c0b3fb445e3d4a1c12e4219a3cc93f89872
parent6be4515194055e3530e2aed9ec445c00bce50c25
parent19a08d266f623d3697b5ca55689bd57eeaae46a6
Merge branch 'collectd-4.8'