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

Merge branch 'master' into sid
---

3d33c6a25acc4d120468a76bd7684fd789a4a64c