From: Marc Fournier <marc@bl.uem.li>
Date: Fri, 16 Dec 2016 21:12:03 +0000 (+0100)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.7.0-1^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3ba9ef92f8d98779c4975d90574b1177a35adbb1;p=pkg-collectd.git

Merge branch 'master' into sid
---

3ba9ef92f8d98779c4975d90574b1177a35adbb1