From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 30 Oct 2010 19:37:44 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~38
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=57e682114e87ea9ed4cc419aea17dfd63cf3917b

Merge commit 'origin/master' into next

Conflicts:
	make.sh
---

57e682114e87ea9ed4cc419aea17dfd63cf3917b
diff --cc make.sh
index 577a123e9b,03cf937360..15923362ad
--- a/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
 -VERSION="2.7"							# Version number
 +VERSION="2.8test"						# Version number
- CORE="41"							# Core Level (Filename)
- PAKFIRE_CORE="40"						# Core Level (PAKFIRE)
+ CORE="42"							# Core Level (Filename)
+ PAKFIRE_CORE="41"						# 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