![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 22 Jul 2006 20:34:27 +0000 (22:34 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 22 Jul 2006 20:34:27 +0000 (22:34 +0200) | ||
| commit | 179d9b650db685f5f04f36a3019e4ffea377d960 | |
| tree | 8809348b5eca5a1c06e10b7ba60b7739005c5802 | tree | snapshot |
| parent | 7e2c12a9fd5b22ddecd7454945ac1ec2061e9050 | commit | diff |
| parent | 8a94ccd77411761bc33dd5c163f36eb4c954237f | commit | diff |
Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd-3.10