Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 10 May 2007 07:51:04 +0000 (09:51 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 10 May 2007 07:51:04 +0000 (09:51 +0200)
commitabf77d54fe3d48f848679a99dc3dbd75c6766a38
tree470c4bd14f53f5655060825c8de16cd3f2bdd0f3
parente6fb7ccca41dc8b9361dc039c4ad29e097fd7962
parentd4a0ba8ef40bbdd52be4ad73d7064171aeed155e
Merge branch 'pull/collectd-4' into collectd-4
src/unixsock.c