Merge branch 'feature-riemann-threshold' of github.com:pyr/collectd into feature...
authorPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 17 Jan 2014 08:25:46 +0000 (09:25 +0100)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 17 Jan 2014 08:25:46 +0000 (09:25 +0100)

Trivial merge