Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@noris.net>
Wed, 5 Mar 2008 08:16:16 +0000 (09:16 +0100)
committerFlorian Forster <octo@noris.net>
Wed, 5 Mar 2008 08:16:16 +0000 (09:16 +0100)
commit9ebb82bf36ac779a8af81f2e9a513226387a5679
tree4cfad557a5c11dce1394cfe91db60d9733989b0b
parent6e855e6ab3bc654a3d6238c75102c66785de8bda
parent72d3720bdccfda355f94fcad234a0ea402e5dc2b
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

ChangeLog
src/network.c
version-gen.sh
ChangeLog
configure.in
src/network.c