Merge commit 'origin/master' into next

Conflicts:
	lfs/libevent2
	lfs/transmission
	src/paks/transmission/install.sh
	src/paks/transmission/uninstall.sh
This commit is contained in:
Arne Fitzenreiter
2011-10-02 21:27:09 +02:00
12 changed files with 140 additions and 8 deletions

View File

@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.11" # Version number
CORE="53" # Core Level (Filename)
CORE="54" # Core Level (Filename)
PAKFIRE_CORE="53" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan