From: Florian Forster Date: Sun, 28 Jun 2015 13:05:45 +0000 (+0200) Subject: Merge branch 'collectd-5.5' X-Git-Tag: collectd-5.6.0~664 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b720b5a6214ab1b9c058c7bd1fb4aad2f90e7889;p=collectd.git Merge branch 'collectd-5.5' --- b720b5a6214ab1b9c058c7bd1fb4aad2f90e7889