![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Tue, 8 Jan 2008 10:23:28 +0000 (11:23 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Tue, 8 Jan 2008 10:23:28 +0000 (11:23 +0100) | ||
| commit | c89c9b7b5e498e5a77c6eb1b1a88593fcced85f5 | |
| tree | 9eeb23a7747ad2a4331f2b0b4d96f9d1de1a06d0 | tree | snapshot |
| parent | ce6906b4b8a38a98f2ba6eb2af7b8eadf0a9be02 | commit | diff |
| parent | 476256bd637ce9789dbeec4d25c8937bdfc9bac2 | commit | diff |
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
src/collectd.conf.pod
Conflicts:
src/collectd.conf.pod
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/configfile.c | diff1 | | diff2 | | blob | history |