Code

Merge branch 'collectd-4.4'
authorFlorian Forster <octo@noris.net>
Mon, 14 Jul 2008 07:46:27 +0000 (09:46 +0200)
committerFlorian Forster <octo@noris.net>
Mon, 14 Jul 2008 07:46:27 +0000 (09:46 +0200)
commit654783aed1fab02766a9cc036e859799e01f6f9e
tree2014d42c1241d71f5f9ab2d08481e58c1ab7d756
parent752e52bc98874f891ae0756b6ab8ccb9a2442650
parent4e51eefd95e80f90eae602958713c9c630659ce7
Merge branch 'collectd-4.4'

Conflicts:

configure.in
configure.in
src/ntpd.c