Merge branch 'collectd-5.5'

diff --cc src/libcollectdclient/network_buffer.c
Simple merge

diff --cc src/network.c
Simple merge

diff --cc version-gen.sh
index d7c6a76,f0f8dca..70b8c26
--- 1/version-gen.sh
--- 2/version-gen.sh
+++ b/version-gen.sh
@@@ -1,10 -1,8 +1,10 @@@
  #!/bin/sh
  
- DEFAULT_VERSION="5.5.1.git"
+ DEFAULT_VERSION="5.5.2.git"
  
 -VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"
 +if [ -d .git ]; then
 +      VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
 +fi
  
  if test -z "$VERSION"; then
        VERSION="$DEFAULT_VERSION"