![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Thu, 8 Sep 2016 06:10:54 +0000 (08:10 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Thu, 8 Sep 2016 06:10:54 +0000 (08:10 +0200) | ||
| commit | 5523a080010dcb7a61dc0dccc3969a2a048e52f9 | |
| tree | 946620d07510f98717c49bee54e9faa9bbc7298c | tree | snapshot |
| parent | ed985cb9d3d89aec3490b17e0fda3ee97908f935 | commit | diff |
| parent | a3444db7419687386919fccf7d14b945f2e9da56 | commit | diff |
Merge branch 'collectd-5.5' into collectd-5.6
| src/types.db | diff1 | | diff2 | | blob | history |