![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Sat, 22 Mar 2008 08:40:00 +0000 (09:40 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Sat, 22 Mar 2008 08:40:00 +0000 (09:40 +0100) | ||
| commit | 4f2642f86673329db9f8cf30854bf39bbdc4c2b2 | |
| tree | 7dc1063656eba213a9067e735452267a46e20e75 | tree | snapshot |
| parent | 53f5cd2cb13cc23d348efb41dba8be25af415a59 | commit | diff |
| parent | 12b23a0ff448672e04ffe2e0fb973751f8a42a34 | commit | diff |
Merge branch 'collectd-4.2' into collectd-4.3