![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 27 Oct 2015 22:39:38 +0000 (23:39 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 27 Oct 2015 22:39:38 +0000 (23:39 +0100) | ||
| commit | d8a02e6c6f5875dfcab7b011d1f340e3a13c9e39 | |
| tree | ab30e7a12e32dec366c764c1c263130178398dda | tree | snapshot |
| parent | 8f7b3f2f73e20e7a43c0fbbbc053beb9ef50f1ec | commit | diff |
| parent | 8d8c82f9537feb8f15f049f3b1c071eaf2f5e2a5 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/collectd-exec.pod | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |