![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 29 Nov 2016 11:31:39 +0000 (12:31 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 29 Nov 2016 11:31:39 +0000 (12:31 +0100) | ||
| commit | 2079ee1517e34de372f58e7e2267ad5c71a8a41f | |
| tree | a78c841b3b71c30162a8c59b66a6f7df067e301b | tree | snapshot |
| parent | 8f5d58fe121bc25d6ba34346a58d922488ed181b | commit | diff |
| parent | 4f9adeefbf3d8e1a556d12e287a14019dacbfd04 | commit | diff |
Merge branch 'collectd-5.5' into collectd-5.6
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec