From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 13 Aug 2009 06:14:24 +0000 (+0200)
Subject: Merge branch 'ff/genericjmx'
X-Git-Tag: collectd-4.8.0~50
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ee203ecd5fae28ab12f158e03e18f2b57394897a;p=collectd.git

Merge branch 'ff/genericjmx'
---

ee203ecd5fae28ab12f158e03e18f2b57394897a