Merge branch 'collectd-5.5' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 07:32:30 +0000 (09:32 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 07:32:30 +0000 (09:32 +0200)
commitfd06911c23375dc40beeef0406ddf98cec7d3fcf
treee7989133c5130f1393fb07d0a8855b2ff8e2d730
parent89be8ccf23c003d22d112de0fe5417d747fa20a4
parent22b9f5441f0bb294e16aa27169d02eb69e32d556
Merge branch 'collectd-5.5' into collectd-5.6
src/network.c