Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 16 Nov 2010 11:20:18 +0000 (12:20 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 16 Nov 2010 11:20:18 +0000 (12:20 +0100)
commit0a6626747f40f7a39947033e8e64242e731cd7e1
tree42941d13e3b559403b78cbde7755a897e14134b7
parent7b32bdd018cd6be37bfd1759fbba8c4623ec6f1e
parent7a36ec8f2c85621240e479c76c910083196f0e2c
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9