Merge branch 'master' into divVerent/crypto2

Conflicts:
	all

diff --cc all
index fc3b969be73a3e988ee46015cc34b020d937dfeb,58e1ea40bf8011ec3a6b4d971287cbc4df4f3403..bd561dde72a4ca59ef025b5719363aed50f15d00
--- 1/all
--- 2/all
+++ b/all
@@@ -945,8 -931,12 +945,12 @@@ case "$cmd" i
                esac
                verbose rm -rf Xonotic Xonotic*.zip
                verbose mkdir -p Xonotic
-               verbose date +%Y%m%d > Xonotic/stamp.txt
+               if [ -n "$RELEASEDATE" ]; then
+                       verbose echo "$RELEASEDATE" > Xonotic/stamp.txt
+               else
+                       verbose date +%Y%m%d > Xonotic/stamp.txt
+               fi
 -              verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
 +              verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
                        verbose cd Xonotic
                        verbose mkdir data fteqcc source source/darkplaces source/fteqcc
                        verbose tar xvf -