Code

Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@noris.net>
Mon, 14 Jul 2008 07:44:29 +0000 (09:44 +0200)
committerFlorian Forster <octo@noris.net>
Mon, 14 Jul 2008 07:44:29 +0000 (09:44 +0200)
Conflicts:

src/ntpd.c

1  2 
configure.in

diff --cc configure.in
Simple merge