Code

Merge branch 'collectd-4.3'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:52:25 +0000 (09:52 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:52:25 +0000 (09:52 +0100)
commita2ef6243e563dae68c71d58c1d9af924a5817e5a
tree369795a8900ab382b37dd230d353498e1efd8497
parent43df21461d523023951746ef669f1bb95f61366d
parentbc0a8f260e4e24bdf664c3dcff919b6f99bfe31d
Merge branch 'collectd-4.3'

Conflicts:

src/unixsock.c
bindings/perl/Collectd/Unixsock.pm
configure.in
src/collectd-unixsock.pod