![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Sun, 5 Mar 2017 17:34:37 +0000 (18:34 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Sun, 5 Mar 2017 17:34:37 +0000 (18:34 +0100) | ||
| commit | 51d29979b01ae0316597898f0e25d4bab7fd7d81 | |
| tree | 996bd7fe42870c06b5ea56f52229aa6876beb966 | tree | snapshot |
| parent | ffaf9b893b6042a76e1c0dadd83ce06904fcc89a | commit | diff |
| parent | 294aa61f5e961b9a9bec1e27e810a10142017db8 | 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 |