![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sun, 13 Apr 2008 09:12:22 +0000 (11:12 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sun, 13 Apr 2008 09:12:22 +0000 (11:12 +0200) | ||
| commit | 0b4c21d702c278b1e5d8b7b3d334a0b6d4831edc | |
| tree | aaf00a0b5e9190f7db20066dbbfd3451fe8ee9b3 | tree | snapshot |
| parent | 0cacae1b594f4ca0fc98798d119bfbad8f3bc6f5 | commit | diff |
| parent | 7af919ac4b76af981002875ff7bef99874f745b7 | commit | diff |
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2