From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 10 Nov 2012 15:44:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next' into thirteen
X-Git-Tag: v2.13-beta1~91^2~1
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=88cb3aa68ec070f7dbb8607e12c29cda08ea8952

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

88cb3aa68ec070f7dbb8607e12c29cda08ea8952
diff --cc make.sh
index 278c807f9a,ea908d9480..b60723d6ff
--- 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="64"							# Core Level (Filename)
- PAKFIRE_CORE="63"						# Core Level (PAKFIRE)
+ PAKFIRE_CORE="64"						# 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