Merge commit 'origin/next'

Conflicts:
	make.sh

diff --git a/make.sh b/make.sh
index 24753ce9ce9d3eb41de3f31bd0eeb4db58267fed..d9abd2a4746d416499e8b67996cfa95001263c02 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -690,7 +690,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$GIT_BRANCH" = "next" ]; then
+  if [ "$GIT_BRANCH" = "master" ]; then
        echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
   else
        echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release