From: Florian Forster <octo@collectd.org>
Date: Fri, 8 Aug 2014 19:20:52 +0000 (+0200)
Subject: Merge branch 'ff/innodb'
X-Git-Tag: collectd-5.5.0~229
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=009bcdff4012d1f0eae13e8b19fb79643d1c655f;p=collectd.git

Merge branch 'ff/innodb'
---

009bcdff4012d1f0eae13e8b19fb79643d1c655f