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

Merge branch 'master' into sid
---

2daec89f3d93a3a46f811b89b354000fcc5b89f9