![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Wed, 22 Feb 2017 10:19:57 +0000 (11:19 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Wed, 22 Feb 2017 10:19:57 +0000 (11:19 +0100) | ||
| commit | 2412d3ca76f7ac24e67543720c1d385188da0ce3 | |
| tree | 3066749f33aab8e85b21a6f6134e0b45b53c77a3 | tree | snapshot |
| parent | 1b0f5d61a3e93e83af6b559b60d661a61afd8d9f | commit | diff |
| parent | e4504c3cc5582ab915903e1b4ba010545ffc8354 | commit | diff |
Merge branch 'collectd-5.7'
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |