From: Florian Forster <octo@collectd.org>
Date: Sun, 18 Aug 2013 09:13:32 +0000 (+0200)
Subject: Merge branch 'ad/aquaero'
X-Git-Tag: collectd-5.4.0~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bdf4ac4bba349bac128fea28fac13fda784ae78c;p=collectd.git

Merge branch 'ad/aquaero'
---

bdf4ac4bba349bac128fea28fac13fda784ae78c