![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 18 Mar 2016 22:44:17 +0000 (23:44 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 18 Mar 2016 22:44:17 +0000 (23:44 +0100) | ||
| commit | 3aeca36659b04725028f123bcea387a37581624a | |
| tree | 6508f52c353f087f77ed776f1263d8c046d514c4 | tree | snapshot |
| parent | 25b5f5c49dd50c64f41b7bf69b8e471b0ffc6f15 | commit | diff |
| parent | 6518cae7c97b5bb1ac3e1d1eca841fe41b5cb656 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |