Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 23 Sep 2012 09:02:34 +0000 (05:02 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 23 Sep 2012 09:02:34 +0000 (05:02 -0400)
Conflicts:
make.sh

1  2 
lfs/dhcp
make.sh

diff --cc lfs/dhcp
Simple merge
diff --cc make.sh
+++ b/make.sh
@@@ -24,8 -24,8 +24,8 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
 -VERSION="2.11"                                                        # Version number
 +VERSION="2.13"                                                        # Version number
- CORE="62"                                                     # Core Level (Filename)
+ CORE="63"                                                     # Core Level (Filename)
  PAKFIRE_CORE="62"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan