From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 13 Apr 2015 22:24:46 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.5.0~12^2~7
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=e9ef1a2f33fb6fb5a379f877fb8c5bb0d3810fed

Merge branch 'collectd-5.3' into collectd-5.4
---

e9ef1a2f33fb6fb5a379f877fb8c5bb0d3810fed
diff --cc version-gen.sh
index c2c0f619,5ab6f78f..7bd07cbc
--- a/version-gen.sh
+++ b/version-gen.sh
@@@ -1,6 -1,6 +1,6 @@@
- #!/usr/bin/env bash
+ #!/bin/sh
  
 -DEFAULT_VERSION="5.3.1.git"
 +DEFAULT_VERSION="5.4.2.git"
  
  VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"