From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 4 Mar 2016 06:09:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into next
X-Git-Tag: v2.19-core100~21
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=4a6cfe51a16575c7100862e2cc6f959bc48c6628

Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

4a6cfe51a16575c7100862e2cc6f959bc48c6628
diff --cc make.sh
index bed9230da9,08178b40b9..8392e30333
--- a/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
  VERSION="2.17"							# Version number
 -CORE="99"							# Core Level (Filename)
 +CORE="100"							# Core Level (Filename)
- PAKFIRE_CORE="98"						# Core Level (PAKFIRE)
+ PAKFIRE_CORE="99"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan
  CONFIG_ROOT=/var/ipfire						# Configuration rootdir