Merge commit 'samba/v3-2-test' into v3-2-stable

(This used to be commit 6811ea1ce2d46f7303b4edf661e27d2edf54724f)

diff --git a/source3/VERSION b/source3/VERSION
index c97db4b04eedc33d90cda0129b3e8f88db7cca63..f0883b95bb0213ede89eec478c07777d37dd448c 100644 (file)
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
 #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
-SAMBA_VERSION_VENDOR_SUFFIX="test"
+SAMBA_VERSION_VENDOR_SUFFIX="stable"
 SAMBA_VERSION_VENDOR_PATCH=