From: Florian Forster <octo@collectd.org>
Date: Fri, 3 Feb 2012 10:49:04 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.0.3~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d0bb20feb1c5915e8b8af24cc2d46c4ac82d6704;p=collectd.git

Merge branch 'collectd-4.10' into collectd-5.0
---

d0bb20feb1c5915e8b8af24cc2d46c4ac82d6704
diff --cc version-gen.sh
index 5bc20a11,1d5416ba..5eb46de6
--- a/version-gen.sh
+++ b/version-gen.sh
@@@ -1,6 -1,6 +1,6 @@@
- #!/bin/sh
+ #!/usr/bin/env bash
  
 -DEFAULT_VERSION="4.10.5.git"
 +DEFAULT_VERSION="5.0.2.git"
  
  VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"