Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --combined make.sh
index a4bbd194319f31a84b09fbdcee6a2137265f0133,4aab5f310aedc155b5d1b4900ac21764e577e98d..9f121d1d8acbc6ca58cdfe9dfc15f1a4be4fec10
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,7 -24,7 +24,7 @@@
  
  NAME="IPFire"                                                                         # Software name
  SNAME="ipfire"                                                                        # Short name
- VERSION="2.3-beta3"
+ VERSION="2.3-test"
  GIT_BRANCH=master:master                                                                              # Version number
  SLOGAN="www.ipfire.org"                                       # Software slogan
  CONFIG_ROOT=/var/ipfire                                       # Configuration rootdir
@@@ -588,7 -588,6 +588,7 @@@ buildipfire() 
    ipfiremake dbus
    ipfiremake bluetooth
    ipfiremake gutenprint
 +  ipfiremake apcupsd
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild