From: Marc Fournier Date: Thu, 28 May 2015 18:21:55 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/collectd-5.3' into collectd-5.4 X-Git-Tag: collectd-5.5.1~116^2~17 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9b43c4ca7442e7886c1fbe339ce57f297872269f;p=collectd.git Merge remote-tracking branch 'origin/collectd-5.3' into collectd-5.4 --- 9b43c4ca7442e7886c1fbe339ce57f297872269f