From: usev6 <use_v6@aglaz.de>
Date: Mon, 29 Apr 2019 18:03:14 +0000 (+0200)
Subject: Update to resolve conflicts due to renamed files
X-Git-Tag: collectd-5.9.0~16^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7045c4b543304ffabaa30a2ca9183489e75eafe3;p=thirdparty%2Fcollectd.git

Update to resolve conflicts due to renamed files

Merge branch 'master' into write_graphite_reverse_host
---

7045c4b543304ffabaa30a2ca9183489e75eafe3