![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Fri, 2 Sep 2016 07:33:10 +0000 (09:33 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Fri, 2 Sep 2016 07:33:10 +0000 (09:33 +0200) | ||
| commit | 915fb28ee1a2fb80f1f0b73f2869bcf981c932c2 | |
| tree | 7fee6e639e6351b0d8165c7292457d09a694f3b6 | tree | snapshot |
| parent | 357cae102b2994f1874f5691dc571543111bd5fa | commit | diff |
| parent | fd06911c23375dc40beeef0406ddf98cec7d3fcf | commit | diff |
Merge branch 'collectd-5.6'