Merge branch 'master' into 2.9beta1

diff --git a/make.sh b/make.sh
index c6d5f690569bf9832e917e163ffebcd1ae1c39de..39932911be57124a394f9672b1aa7c926584814e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.8test"                                              # Version number
+VERSION="2.9beta1"                                             # Version number
 CORE="44"                                                      # Core Level (Filename)
 PAKFIRE_CORE="43"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch