Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Mon, 25 Jul 2016 11:52:16 +0000 (13:52 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 25 Jul 2016 11:52:16 +0000 (13:52 +0200)
commit49ac868d2346c77335272b8a643bca295db9feaa
tree6cb5c2ab9161a8e5a5ece18d26e83ab9aff8cd58
parente0e307657d6b751d6beb5afb92c9359a6df7f5e8
parent8b4fed9940e02138b7e273e56863df03d1a39ef7
Merge branch 'collectd-5.4' into collectd-5.5
src/libcollectdclient/network_buffer.c
src/network.c