Merge branch '2.3.x' into devel

Conflicts:
	debian/postinst

debian/control

@@ -17,6 +17,7 @@ Depends: apache2,
  gzip (>= 1.3.12),
  libao-ocaml,
  libapache2-mod-php5,
+ libc-bin,
  libcamomile-ocaml-data,
  libesd0,
  libmad-ocaml,
@@ -27,6 +28,7 @@ Depends: apache2,
  libsoundtouch-ocaml,
  libtaglib-ocaml,
  liquidsoap (>= 1.0.0~),
+ locales,
  lsof,
  monit,
  multitail,

debian/postinst

@@ -229,7 +229,7 @@ case "$1" in
         echo "Upgrades from Airtime versions before 2.1.0 are not supported. Please back up your files and perform a clean install."
 
       elif [ "${APACHESETUP}" == "no thanks" ]; then
-        echo "Please run the ${tmpdir}/install_minimal/airtime-install script after you have set up the web server."
+        echo "Please run the ${tmpdir}/install_minimal/airtime-install script with the -d option after you have set up the web server."
 
       else