From: Marc Fournier <marc@bl.uem.li>
Date: Tue, 31 May 2016 16:34:06 +0000 (+0200)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.5.2-2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=784957ccd992247f82bd9dca77af378339d17363;p=pkg-collectd.git

Merge branch 'master' into sid
---

784957ccd992247f82bd9dca77af378339d17363