From: Marc Fournier <marc@bl.uem.li>
Date: Fri, 22 Jan 2016 16:36:11 +0000 (+0100)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.5.1-1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=af37ae5c85da6b153b076f5cf44065a5bd8bd9fd;p=pkg-collectd.git

Merge branch 'master' into sid
---

23c6241ec47be1e651f5423265a34c02b307afa2