Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:28:28 +0000 (17:28 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:28:28 +0000 (17:28 +0100)
commit004074af297a219208fa9e903db8c5dcdd7e1950
treea02c9999ee6736f1aae06ee7343611f96dc03977
parent14d94fb83e1e9487dc46415b4334e7217b9175e9
parent9dd91dce20c5d4691f8e8170723ec4731acb76f9
Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
src/utils_match.c
src/smart.c
src/utils_match.c