Merge branch 'collectd-4.3'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 24 Mar 2008 12:36:17 +0000 (13:36 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 24 Mar 2008 12:36:17 +0000 (13:36 +0100)
1  2 
configure.in
src/collectd-unixsock.pod

diff --cc configure.in
Simple merge
Simple merge