![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Sat, 5 Dec 2015 22:07:14 +0000 (23:07 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Sat, 5 Dec 2015 22:07:14 +0000 (23:07 +0100) | ||
| commit | f9a6df05238501ca41931af0d8d51acea716c105 | |
| tree | 1eceae59874709104a9f97b529202b4f4c32d132 | tree | snapshot |
| parent | 791e99923dbbf045b11fbd7b0ea8df647e29593e | commit | diff |
| parent | ac8f02ab4f25a6b62ec763a74442ae2d65450679 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5