From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 16 Nov 2015 20:09:40 +0000 (+0100)
Subject: Merge branch 'master' into sid
X-Git-Tag: collectd-5.5.0-4~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cb309bf40c178740befa84cf10f52ed60de6aecb;p=pkg-collectd.git

Merge branch 'master' into sid
---

cb309bf40c178740befa84cf10f52ed60de6aecb