![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 6 May 2008 11:44:46 +0000 (13:44 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 6 May 2008 11:44:46 +0000 (13:44 +0200) | ||
| commit | 53bd9256920f01cc5b835639c7e7971979ed3350 | |
| tree | 77889b59d4f939e914a67b677600491854d74beb | tree | snapshot |
| parent | 4d36d5826a3853ccd62195daf3b831d942850f1a | commit | diff |
| parent | f16fb0982b5f5781ab723f83eacc5df9509b6ef6 | commit | diff |
Merge branch 'collectd-4.2' into collectd-4.3