Code

Merge branch 'ff/netlib'
authorFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 07:25:01 +0000 (08:25 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 07:25:01 +0000 (08:25 +0100)
commit3faf514fd9b869cadda0f895e14e5036313c7781
treeafbe7716065e37dd543d14f2b78ed927208fce83
parent28460d4f235bb0272c98c830d14b9d7a73f812b7
parentda69316b56551acab689af78809ec88d48a601cd
Merge branch 'ff/netlib'

Conflicts:
src/collectdctl.c
src/libcollectdclient/client.c
src/libcollectdclient/collectd/client.h
configure.in
src/Makefile.am
src/collectd-nagios.c
src/collectdctl.c
src/libcollectdclient/client.c
src/libcollectdclient/collectd/client.h