Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 21 Jul 2016 05:49:25 +0000 (07:49 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 21 Jul 2016 05:49:25 +0000 (07:49 +0200)
commite0e307657d6b751d6beb5afb92c9359a6df7f5e8
treeb532766b4be86edb8cbc566417be9c080212367b
parente2b289ea039269b60edd459d2d514d3f82820e3a
parentb589096f907052b3a4da2b9ccc9b0e2e888dfc18
Merge branch 'collectd-5.4' into collectd-5.5
src/network.c