From 8eff5afaced13c9c30337c11da4920fc1d2394ce Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 29 Oct 2015 10:55:01 +0100
Subject: prepare for 5.6.15

---
 NEWS               | 2 +-
 configure.in       | 2 +-
 main/php_version.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 2b57335e7c..cceba66d75 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-15 Oct 2015, PHP 5.6.15
+29 Oct 2015, PHP 5.6.15
 
 - Core:
   . Fixed bug #70681 (Segfault when binding $this of internal instance method
diff --git a/configure.in b/configure.in
index e4111c1b4a..c383232b12 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=6
 PHP_RELEASE_VERSION=15
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
 
diff --git a/main/php_version.h b/main/php_version.h
index 9887ccd1f3..f1ed780da5 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 6
 #define PHP_RELEASE_VERSION 15
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.6.15RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.6.15"
 #define PHP_VERSION_ID 50615
-- 
cgit v1.2.1