![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 14 Jun 2016 05:44:35 +0000 (07:44 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 14 Jun 2016 05:45:14 +0000 (07:45 +0200) | ||
| commit | e2b289ea039269b60edd459d2d514d3f82820e3a | |
| tree | bc8e6130306b7c8e293b2726c4444f71247bf184 | tree | snapshot |
| parent | 65c20e41cfad6e7ab024983f561835fd347124ce | commit | diff |
| parent | 4371ef7f98f6f51ea3df34d5e26e175d6b44a328 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/collectd-email.pod | diff1 | | diff2 | | blob | history |
| src/collectd-exec.pod | diff1 | | diff2 | | blob | history |
| src/collectd-perl.pod | diff1 | | diff2 | | blob | history |
| src/collectd-python.pod | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/collectd.pod | diff1 | | diff2 | | blob | history |