From: Marc Fournier <marc@bl.uem.li>
Date: Tue, 1 Nov 2016 07:00:05 +0000 (+0100)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.6.1-2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=62553e9bd76fca7e5cdc38f0dcce2213093801bd;p=pkg-collectd.git

Merge branch 'master' into sid
---

ac8cb5e413fa0dd4848e63f2fbc69dbf9e138d7f