Merge branch 'collectd-5.4'

Conflicts:
	src/Makefile.am
	src/network.c

diff --combined version-gen.sh
index e251950,7bd07cb..7b573ab
--- 1/version-gen.sh
--- 2/version-gen.sh
+++ b/version-gen.sh
@@@ -1,8 -1,8 +1,8 @@@
- #!/usr/bin/env bash
+ #!/bin/sh
  
  DEFAULT_VERSION="5.4.2.git"
  
 -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
 +VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"
  
  if test -z "$VERSION"; then
        VERSION="$DEFAULT_VERSION"