Merge branch 'collectd-4.9'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:13:53 +0000 (13:13 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:13:53 +0000 (13:13 +0100)
commitc7565f60af85bff6e04b52bed4703cf9ab35f3eb
tree6ed7f549d0641027f893b0a9c6f876fe10044029
parent035fe0f7bc9ac42f5b0f2f221627c949709caf4b
parent5ad3a491af300d7336112607e20b0364d1f3f2bb
Merge branch 'collectd-4.9'