From: Arne Fitzenreiter <Arne_F@ipfire.org>
Date: Wed, 3 Oct 2012 14:50:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into thirteen
X-Git-Tag: v2.13-beta1~163^2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=79117dc15f51f12163f061e222bb02d77fa9b06d

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

79117dc15f51f12163f061e222bb02d77fa9b06d
diff --cc make.sh
index 299ee6d36c,dec06f8f7a..b0f8b31b26
--- a/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
 -VERSION="2.11"							# Version number
 +VERSION="2.13"							# Version number
  CORE="63"							# Core Level (Filename)
- PAKFIRE_CORE="62"						# Core Level (PAKFIRE)
+ PAKFIRE_CORE="63"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan
  CONFIG_ROOT=/var/ipfire						# Configuration rootdir