Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 1 Oct 2009 19:33:37 +0000 (21:33 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 1 Oct 2009 19:33:37 +0000 (21:33 +0200)
1  2 
src/unixsock.c

diff --cc src/unixsock.c
Simple merge