![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Mon, 21 Jan 2008 17:30:43 +0000 (18:30 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Mon, 21 Jan 2008 17:30:43 +0000 (18:30 +0100) | ||
| commit | b62e76ba5220c5279c29d970a65fa5a74dc1f145 | |
| tree | f9c8a9d0ed6db402c081b8bef1a901f793fd06f9 | tree | snapshot |
| parent | 7c42c7b1c428f5cc5f30af1122488497b3b31b96 | commit | diff |
| parent | ff4ebc0fd3c93a39a18edc629d61787f60a92706 | commit | diff |
Merge branch 'collectd-4.2'