From: Marc Fournier <marc@bl.uem.li>
Date: Wed, 21 Sep 2016 12:34:36 +0000 (+0200)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.5.2-2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ab1a31e7ed826ca6e5077273fa917e4692bedbce;p=pkg-collectd.git

Merge branch 'master' into sid
---

4269cf669f0392c4ac23f315e76a5c5381504630