From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 6 Apr 2016 02:21:21 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~371
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=306a842ef1980bbcf48def6d960c13519eafd750;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed order
  Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference)
  update NEWS
  Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime()
---

306a842ef1980bbcf48def6d960c13519eafd750