Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:48:27 +0000 (09:48 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:48:27 +0000 (09:48 +0100)
commitbc0a8f260e4e24bdf664c3dcff919b6f99bfe31d
treefa9c768531dd40e4b3803efe058914a606ea3670
parentac03ae49d85c01fe2da58dd78f66db58416d81cc
parent583b04d5826669eb182cb6ea538cf68266721ccb
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

src/unixsock.c
configure.in
src/collectd-unixsock.pod
src/liboconfig/parser.y
src/perl.c