From: Florian Forster <octo@collectd.org>
Date: Tue, 21 May 2013 12:51:22 +0000 (+0200)
Subject: Merge branch 'ef/mic'
X-Git-Tag: collectd-5.4.0~42
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=94a1816eb0fe9291ccfb966d15eb646e93086368;p=collectd.git

Merge branch 'ef/mic'
---

94a1816eb0fe9291ccfb966d15eb646e93086368