From 6c78ce66de2a9c4f872ae67b967a5c6e2a8f6c47 Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Wed, 6 Jan 2016 10:18:17 +0100
Subject: 5.5.31

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

diff --git a/NEWS b/NEWS
index ee0e9869bd..07c5237015 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-** PHP 5.5 is in security-only mode , please do not commit to this branch **
 
 07 Jan 2015, PHP 5.5.31
 
diff --git a/configure.in b/configure.in
index 6dcfdf4e3f..c5ecd5bbba 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=5
 PHP_RELEASE_VERSION=31
-PHP_EXTRA_VERSION="-dev"
+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 02dab19917..92ead6d93e 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 5
 #define PHP_RELEASE_VERSION 31
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.31-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.31"
 #define PHP_VERSION_ID 50531
-- 
cgit v1.2.1