From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 1 Dec 2014 08:51:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v2.17-core87~103
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=7370484e87052bfc6f9e146d925adab203f1cea0

Merge remote-tracking branch 'origin/next'

Conflicts:
	make.sh
---

7370484e87052bfc6f9e146d925adab203f1cea0
diff --cc make.sh
index 2b24e1159e,40075916eb..3f5b248379
--- a/make.sh
+++ b/make.sh
@@@ -24,8 -24,8 +24,8 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
- VERSION="2.15"							# Version number
- CORE="85"							# Core Level (Filename)
+ VERSION="2.17"							# Version number
 -CORE="86"							# Core Level (Filename)
++CORE="86test1"							# Core Level (Filename)
  PAKFIRE_CORE="85"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan