From: Marc Fournier <marc@bl.uem.li>
Date: Sun, 9 Oct 2016 20:06:07 +0000 (+0200)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.6.1-1^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bcabe68fa8833ffc00f884155f748b6408b083ca;p=pkg-collectd.git

Merge branch 'master' into sid
---

bcabe68fa8833ffc00f884155f748b6408b083ca