From: Pierre-Yves Ritschard <pyr@spootnik.org>
Date: Tue, 22 Jul 2014 11:55:49 +0000 (+0200)
Subject: Merge branch 'master' into feature-riemann-threshold
X-Git-Tag: collectd-5.5.0~291^2~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=639f00e946bb3182688661a99119aa5f5d6c81b6;p=collectd.git

Merge branch 'master' into feature-riemann-threshold
---

639f00e946bb3182688661a99119aa5f5d6c81b6