![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 24 Feb 2017 16:28:28 +0000 (17:28 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 24 Feb 2017 16:28:28 +0000 (17:28 +0100) | ||
| commit | 004074af297a219208fa9e903db8c5dcdd7e1950 | |
| tree | a02c9999ee6736f1aae06ee7343611f96dc03977 | tree | snapshot |
| parent | 14d94fb83e1e9487dc46415b4334e7217b9175e9 | commit | diff |
| parent | 9dd91dce20c5d4691f8e8170723ec4731acb76f9 | commit | diff |
Merge branch 'collectd-5.6' into collectd-5.7
Conflicts:
src/utils_match.c
Conflicts:
src/utils_match.c
| src/smart.c | diff1 | | diff2 | | blob | history |
| src/utils_match.c | diff1 | | | | blob | history |