Code

Merge branch 'collectd-4.2'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Dec 2007 07:16:16 +0000 (08:16 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 13 Dec 2007 07:16:16 +0000 (08:16 +0100)
commit4a5e97d6e317ee050b0a942e50159473a7d144dc
tree4e3d4953378b3e1be21563779b3445131e7f2f8b
parent8798c7ec333eb16410161d99487ab0bee4d9adc3
parent3b915093d8cbc7738b2de59f6ebc38f195131002
Merge branch 'collectd-4.2'

Conflicts:

src/utils_llist.c
src/collectd-perl.pod
src/collectd.conf.pod
src/logfile.c
src/utils_avltree.c
src/utils_llist.c