From 2d962af4c0c3972766a64887a370dda2126ac770 Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyrael@php.net>
Date: Tue, 9 Jun 2015 14:20:55 +0200
Subject: [PATCH] prepare for 7.0.0alpha1

---
 NEWS | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 9e1b229f53..234dde88f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,8 @@
-PHP                                                                        NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 20??, PHP 7.0.0
+25 Jun 2015, PHP 7.0.0 Alpha 2
 
-- CLI server:
-  . Refactor MIME type handling to use a hash table instead of linear search.
-    (Adam)
-  . Update the MIME type list from the one shipped by Apache HTTPD. (Adam)
-  . Added support for SEARCH WebDav method. (Mats Lindh)
+11 Jun 2015, PHP 7.0.0 Alpha 1
 
 - Core:
   . Fixed bug #69767 (Default parameter value with wrong type segfaults).
@@ -88,6 +84,12 @@
   . Fixed bug #69511 (Off-by-one buffer overflow in php_sys_readlink).
     (Jan Starke, Anatol)
 
+- CLI server:
+  . Refactor MIME type handling to use a hash table instead of linear search.
+    (Adam)
+  . Update the MIME type list from the one shipped by Apache HTTPD. (Adam)
+  . Added support for SEARCH WebDav method. (Mats Lindh)
+
 - Curl:
   . Fixed bug #68937 (Segfault in curl_multi_exec). (Laruence)
   . Removed support for unsafe file uploads. (Nikita)
-- 
2.40.0