Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 14 Apr 2017 12:32:01 +0000 (14:32 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 14 Apr 2017 12:32:01 +0000 (14:32 +0200)
commit42b8d7550d029ed9aef6f25e3eb2009c1f18b144
treecd2fe513e35f2b0f8dab2d4812fd24c896f1b11f
parent3f710d0a3a4d60dc9d988c1f561b7c3586f238b9
parentf6be4f9b49b949b379326c3d7002476e6ce4f211
Merge branch 'collectd-5.6' into collectd-5.7
src/network.c