Merge branch 'collectd-4.4'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:27:14 +0000 (09:27 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:27:14 +0000 (09:27 +0200)
commitabfe65ffb5239060c0c9558d916bbeddee0bc86c
treec70238d625b5443210ac253f93dea01eb20ce197
parent5e700757575fa6606cf201947cb0efb57ce12e6d
parent61011a9d336d85890eac845c5af23a8046e74c10
Merge branch 'collectd-4.4'

Conflicts:

src/tcpconns.c
configure.in
src/Makefile.am
src/snmp.c
src/swap.c
src/tcpconns.c