From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 1 Nov 2006 10:34:16 +0000 (+0100)
Subject: Merge branch 'ff/mysql'
X-Git-Tag: collectd-3.11.0~61^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=13c401437fad4b777d06fba5b45652065e54aaf5;p=collectd.git

Merge branch 'ff/mysql'
---

13c401437fad4b777d06fba5b45652065e54aaf5