![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 12 Sep 2007 09:15:54 +0000 (11:15 +0200) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 12 Sep 2007 09:15:54 +0000 (11:15 +0200) | ||
| commit | 90ac9957e95378d729bce1c00bb0ef2efadab33e | |
| tree | 9bcc1a2643c434fc3d9fa37c5e73ee13d2e5164c | tree | snapshot |
| parent | 27f6db4769cac5727888c327dbbf1b88da4f3ca6 | commit | diff |
| parent | feb920d8c7311f2f737af03eb7438196ede6ebda | commit | diff |
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
ChangeLog
configure.in
Conflicts:
ChangeLog
configure.in
| ChangeLog | diff1 | | diff2 | | blob | history |
| src/dns.c | diff1 | | diff2 | | blob | history |
| src/ntpd.c | diff1 | | diff2 | | blob | history |
| src/plugin.c | diff1 | | diff2 | | blob | history |
| src/rrdtool.c | diff1 | | diff2 | | blob | history |
| src/unixsock.c | diff1 | | diff2 | | blob | history |