From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 12 Jul 2011 05:40:37 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-core53~72
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=923ad92ac18cf39f93ca909faa3bac0505c09462

Merge branch 'master' into next

Conflicts:
	make.sh
---

923ad92ac18cf39f93ca909faa3bac0505c09462
diff --cc make.sh
index 6d1e423905,f42082c832..8c08fc34cb
--- a/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
 -VERSION="2.9"							# Version number
 +VERSION="2.10"							# Version number
- CORE="50"							# Core Level (Filename)
- PAKFIRE_CORE="49"						# Core Level (PAKFIRE)
+ CORE="51"							# Core Level (Filename)
+ PAKFIRE_CORE="50"						# 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