From: Florian Forster Date: Sat, 6 Aug 2016 19:13:22 +0000 (+0200) Subject: Merge remote-tracking branches 'github/pr/1857', 'github/pr/1859' and 'github/pr... X-Git-Tag: collectd-5.6.0~95 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=474d70e02d04de92aa7503b3887989729bbbff02;p=collectd.git Merge remote-tracking branches 'github/pr/1857', 'github/pr/1859' and 'github/pr/1860' --- 474d70e02d04de92aa7503b3887989729bbbff02