]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Mon, 21 Dec 2015 10:11:01 +0000 (18:11 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 21 Dec 2015 10:11:01 +0000 (18:11 +0800)
* PHP-7.0:
  Fixed bug #71178 (preg_replace with arrays creates [0] in replace array if not already set)
  Align #71165 entry format


Trivial merge