From: Xinchen Hui <laruence@php.net>
Date: Thu, 18 Jun 2015 14:30:01 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.0.0alpha2~2^2~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d54e6f015b88cd6e101b6ff5111780cd8935d3d3;p=php

Merge branch 'master' of git.php.net:php-src
---

d54e6f015b88cd6e101b6ff5111780cd8935d3d3
diff --cc NEWS
index 0292cc9796,0292cc9796..13af3adfc8
--- a/NEWS
+++ b/NEWS
@@@ -3,6 -3,6 +3,7 @@@ PH
  25 Jun 2015, PHP 7.0.0 Alpha 2
  
  - Core:
++  . Fixed bug #69872 (uninitialised value in strtr with array). (Laruence)
    . Fixed bug #69868 (Invalid read of size 1 in zend_compile_short_circuiting).
      (Laruence)
    . Fixed bug #69823 (PHP 7.0.0alpha1 segmentation fault when exactly 33