![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Tue, 5 Jan 2010 10:47:44 +0000 (11:47 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Tue, 5 Jan 2010 10:47:44 +0000 (11:47 +0100) | ||
| commit | 9622e4d30f90e9eefca1d43fefc6bf85785074d3 | |
| tree | 51635829f0d1ffb025d928a3d1f4b69f1ff8717a | tree | snapshot |
| parent | 6254a763a3103ee0d3a09726da53dfc8b3bc8dbc | commit | diff |
| parent | 0b4f63782617b308abf908fbb2fc7ec9afe039db | commit | diff |
Merge branch 'collectd-4.8' into collectd-4.9