From: Marc Fournier <marc@bl.uem.li>
Date: Mon, 23 Jan 2017 19:48:23 +0000 (+0100)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.7.1-1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=31911fd6e924eb561f0d09b206d41a4e77c8017e;p=pkg-collectd.git

Merge branch 'master' into sid
---

86468c27119e776a104594fdba88b3da254de205