From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 16 Nov 2010 23:51:39 +0000 (+0100)
Subject: Merge commit 'origin/master' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=08d5192eb1ac55711e9c880096f024d1515bd08b

Merge commit 'origin/master' into next
---

08d5192eb1ac55711e9c880096f024d1515bd08b
diff --cc make.sh
index 4bec05b9b,b8035b68f..36211fec6
--- 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="42"							# Core Level (Filename)
- PAKFIRE_CORE="41"						# Core Level (PAKFIRE)
+ PAKFIRE_CORE="42"						# 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