Merge branch 'next' into fifteen

This commit is contained in:
Arne Fitzenreiter
2013-12-10 00:15:01 +01:00
17 changed files with 122 additions and 341 deletions

View File

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