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

Merge branch 'master' into sid
---

3b3c9375cb3bb12227e76bf56d1a7d97706a8077