Merge branch 'collectd-4.2'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Dec 2007 18:04:45 +0000 (19:04 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Dec 2007 18:04:45 +0000 (19:04 +0100)
commite8993811715b8d505a176e1f34985ac2b63791a2
treef51d3c8b37f96f8d1888e4095645bc8cfbd34f55
parentc41e4859301c69b1489abcd9e2e7c7959d5ddf50
parentce6906b4b8a38a98f2ba6eb2af7b8eadf0a9be02
Merge branch 'collectd-4.2'

Conflicts:

bindings/Makefile.am
bindings/Makefile.am
src/Makefile.am
src/network.c
src/utils_avltree.c
src/utils_avltree.h