![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Wed, 23 Jan 2008 12:57:29 +0000 (13:57 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Wed, 23 Jan 2008 12:57:29 +0000 (13:57 +0100) | ||
| commit | 278d000ffbd978fce52871a9f33f0cf5e1ce49b7 | |
| tree | 7650f5b852417e91299e07f93d9f3393731bf3d1 | tree | snapshot |
| parent | 3e5c93f05cbea0639b8401b7a6e6f382ca6aad1f | commit | diff |
| parent | df724fee6b417cfbeea2925f4c6fd8c70f9a7d66 | commit | diff |
Merge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1