![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 29 Nov 2016 11:38:59 +0000 (12:38 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Tue, 29 Nov 2016 11:38:59 +0000 (12:38 +0100) | ||
| commit | 2e632b0929fb957fd686231658bc2999fdfb4b20 | |
| tree | 05f6cd719c66b2b489a1ae2ec5265c541bd007ca | tree | snapshot |
| parent | 6c17c8ccba745714c4d7cc10dc3ca57f2d0d293f | commit | diff |
| parent | 8dcf1473b25c4649289ea8b8fb5cb390f2493ce3 | commit | diff |
Merge branch 'collectd-5.6' into collectd-5.7
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |