Merge branch 'collectd-5.0'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:44 +0000 (08:47 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:44 +0000 (08:47 +0100)
commit738d9489468b71d867ac32c9ac7b2ba29e87a39c
tree963620fd6982f57b69332b33e70b80adcc550053
parent801389e2a2f0f232f7014702e276c5f992cca723
parent4dc9287f4de0283ae986444377075dcbdada2871
Merge branch 'collectd-5.0'