From 671ef9fda7ec5876e5c1da2d98e296fb7e7620c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= <johannes@php.net>
Date: Thu, 25 Apr 2013 17:58:02 +0200
Subject: [PATCH 1/2] Fix NEWS

---
 NEWS | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index af4957e365c..f7e6d5b6a2a 100644
--- a/NEWS
+++ b/NEWS
@@ -6,15 +6,15 @@ PHP                                                                        NEWS
   . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: 
     segfault). (Laruence)
   . Fixed bug #64458 (dns_get_record result with string of length -1). (Stas)
-  . Fixed bugs #47675 and #64577 (fd leak on Solaris)
+  . Fixed bugs #47675 and #64577 (fd leak on Solaris). (Rasmus)
+
+- Streams:
+  . Fixed Windows x64 version of stream_socket_pair() and improved error
+    handling. (Anatol Belski)
 
 - Zip:
   . Fixed bug #64342 (ZipArchive::addFile() has to check for file existence).
-  (Anatol)
-
-- Streams:
-  . Fixed Windows x64 version of stream_socket_pair() and improved error handling
-  (Anatol Belski)
+    (Anatol)
 
 11 Apr 2013, PHP 5.3.24
 

From 63434524f82f8686e16bb6ebed10ad206987481f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= <johannes@php.net>
Date: Thu, 25 Apr 2013 18:02:53 +0200
Subject: [PATCH 2/2] PHP 5.3.26 this will be

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

diff --git a/NEWS b/NEWS
index f7e6d5b6a2a..5ea0f5a2f8a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2013, PHP 5.3.26
+
 ?? ??? 2013, PHP 5.3.25
 
+### ADD ENTRIES ABOVE FOR 5.3.26. 5.3.25 NEWS WILL BE UPDATED BY RM ON MERGE ###
+
 - Core:
   . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: 
     segfault). (Laruence)
diff --git a/configure.in b/configure.in
index f4cbab31a72..bfbc219b63e 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=25
+PHP_RELEASE_VERSION=26
 PHP_EXTRA_VERSION="-dev"
 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 8ac49450d0c..eeaffa3e449 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 3
-#define PHP_RELEASE_VERSION 25
+#define PHP_RELEASE_VERSION 26
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.25-dev"
-#define PHP_VERSION_ID 50325
+#define PHP_VERSION "5.3.26-dev"
+#define PHP_VERSION_ID 50326