Merge branch 'next'

Conflicts:
	config/rootfiles/core/37/filelists/files
	config/rootfiles/packages/gutenprint
	doc/packages-list.txt
	src/pakfire/lib/functions.sh

diff --cc config/rootfiles/oldcore/37/update.sh
Simple merge

diff --cc config/rootfiles/packages/gutenprint
Simple merge

diff --cc make.sh
index 40a9e4b02ef90eee6c9c4197fed6e9a8941e9743,7121005e77c163130cbbcfa272b680a580150798..9c7369c7425ad389777e4c8ee53a89db4787bac4
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
- VERSION="2.5"                                                 # Version number
- CORE="37"                                                     # Core Level (Filename)
+ VERSION="2.6"                                                 # Version number
 -CORE="37"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="36"                                             # Core Level (PAKFIRE)
++CORE="38"                                                     # Core Level (Filename)
 +PAKFIRE_CORE="37"                                             # 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