Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 28 Feb 2008 22:06:16 +0000 (23:06 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 28 Feb 2008 22:06:16 +0000 (23:06 +0100)
commit6e855e6ab3bc654a3d6238c75102c66785de8bda
tree04cab540f8953ed992f49e86c650131ee36f4510
parent8057cd230cbc322e17f7435732ea5b73eef1fa08
parentaa76e4a1c4f95f26c97d7c599409dacbfac4c24a
Merge branch 'collectd-4.2' into collectd-4.3
configure.in
src/common.c
src/common.h
src/network.c