From: Christoph M. Becker <cmb@php.net>
Date: Sun, 12 Jul 2015 17:06:09 +0000 (+0200)
Subject: Merge branch 'master' of http://git.php.net/repository/php-src
X-Git-Tag: php-7.1.1RC1~35^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0002f18af6b1ea9e7735634377a26ba2673ccc62;p=php

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

# By Christoph M. Becker (3) and Tjerk Meesters (1)
# Via Christoph M. Becker (1) and Tjerk Meesters (1)
* 'master' of http://git.php.net/repository/php-src:
  Fixed #70053	MutlitpleIterator array-keys incompatible change in PHP 7
  updated NEWS
  updated NEWS
  Fix #68714: copy 'n paste error
---

0002f18af6b1ea9e7735634377a26ba2673ccc62