From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 23 Sep 2012 09:02:34 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/next' into thirteen
X-Git-Tag: v2.13-beta1~163^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e0a1a503b90c5c80016399308bb2585edba219b;p=people%2Fms%2Fipfire-2.x.git

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

Conflicts:
	make.sh
---

5e0a1a503b90c5c80016399308bb2585edba219b
diff --cc make.sh
index e02365f45b,773da66292..c139bf5275
--- 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="62"							# Core Level (Filename)
+ CORE="63"							# Core Level (Filename)
  PAKFIRE_CORE="62"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan