Merge branch 'collectd-5.4'

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

diff --git a/version-gen.sh b/version-gen.sh
index e251950..7b573ab 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 DEFAULT_VERSION="5.4.2.git"