From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 9 Apr 2012 10:15:59 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.11-core61^2~56
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=6560ecaa51f5493aa5674825d1d1b7bc9e464184;hp=-c

Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/58/filelists/files
	make.sh
---

6560ecaa51f5493aa5674825d1d1b7bc9e464184
diff --combined config/rootfiles/core/58/filelists/files
index 047127e7e5,afb3d99699..19d98e57cf
--- a/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@@ -1,7 -1,3 +1,10 @@@
  etc/system-release
  etc/issue
  etc/vimrc
++<<<<<<< HEAD
 +srv/web/ipfire/cgi-bin/index.cgi
 +srv/web/ipfire/cgi-bin/ovpnmain.cgi
 +var/ipfire/general-functions.pl
 +var/ipfire/langs
++=======
++>>>>>>> master
diff --combined make.sh
index a720b627b0,3535bebe98..cc46b57b0d
--- a/make.sh
+++ b/make.sh
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"							# Software nam
  SNAME="ipfire"							# Short name
  VERSION="2.11"							# Version number
  CORE="58"							# Core Level (Filename)
- PAKFIRE_CORE="57"						# Core Level (PAKFIRE)
+ PAKFIRE_CORE="58"						# 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
@@@ -572,7 -572,6 +572,7 @@@ buildipfire() 
    ipfiremake Locale-Country
    ipfiremake XML-Parser
    ipfiremake Crypt-PasswdMD5
 +  ipfiremake Net-Telnet
    ipfiremake python-setuptools
    ipfiremake python-clientform
    ipfiremake python-mechanize