]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJulien Pauli <jpauli@php.net>
Tue, 22 Dec 2015 15:28:12 +0000 (16:28 +0100)
committerJulien Pauli <jpauli@php.net>
Tue, 22 Dec 2015 15:28:12 +0000 (16:28 +0100)
* PHP-7.0:
  Updated NEWS
  Fix #70720
  Align NEWS entry format

1  2 
ext/standard/string.c

Simple merge