From: Pierre-Yves Ritschard <pyr@spootnik.org>
Date: Sat, 26 Jul 2014 07:05:40 +0000 (+0200)
Subject: Merge branch 'master' of github.com:collectd/collectd
X-Git-Tag: collectd-5.5.0~285
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f26c9db10bf0a1efdb33c5c682824254059758e6;p=collectd.git

Merge branch 'master' of github.com:collectd/collectd
---

f26c9db10bf0a1efdb33c5c682824254059758e6