Merge commit 'origin/v4-0-stable' into v4-0-test

(This used to be commit 15cf55f9799d806c31a6a4e14a5c77df89dfe35b)

diff --git a/source4/VERSION b/source4/VERSION
index 29ff51638e3b94809a474dd7e8029f0dece36b65..d40eba4e8ad5402f030887fd1b0a3c661269304e 100644 (file)
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE=
 # e.g. SAMBA_VERSION_ALPHA_RELEASE=1                   #
 #  ->  "4.0.0alpha1"                                   #
 ########################################################
-SAMBA_VERSION_ALPHA_RELEASE=3
+SAMBA_VERSION_ALPHA_RELEASE=4
 
 ########################################################
 # For 'pre' releases the version will be               #