![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 23 Feb 2008 09:48:19 +0000 (10:48 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 23 Feb 2008 09:48:19 +0000 (10:48 +0100) | ||
| commit | 8ea1756522f94af8e0bb7d06c800d94874f13549 | |
| tree | a9c75fad957d427cd8f034980b5010a20921a4da | tree | snapshot |
| parent | fc0c95b33d7ddbd02071c5835b25d777812335c6 | commit | diff |
| parent | 97a56612a875c1f1003b13398c0b757c308a7ed5 | commit | diff |
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2