From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 3 Nov 2012 16:04:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next' into thirteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=534fb55f9d0a212c5d857eb3eccabe5c08df1ba1

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

Conflicts:
	make.sh
---

534fb55f9d0a212c5d857eb3eccabe5c08df1ba1
diff --cc make.sh
index 59b8d511d,f52f9e8b3..55684d574
--- a/make.sh
+++ b/make.sh
@@@ -24,8 -24,8 +24,8 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
 -VERSION="2.11"							# Version number
 +VERSION="2.13"							# Version number
- CORE="63"							# Core Level (Filename)
+ CORE="64"							# Core Level (Filename)
  PAKFIRE_CORE="63"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan