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)
commit4e51eefd95e80f90eae602958713c9c630659ce7
tree05e1497f50a0ec40fa36b097d099aa87411e49bd
parent41f141639046a261063cf346fe7f89cd4cb9cc59
parentbcb24183992bccb89769b92077fcdeade83689e1
Merge branch 'collectd-4.3' into collectd-4.4

Conflicts:

src/ntpd.c
configure.in