Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Tue, 22 Dec 2015 15:26:30 +0000 (16:26 +0100)
committerJulien Pauli <jpauli@php.net>
Tue, 22 Dec 2015 15:26:30 +0000 (16:26 +0100)
commit332b778d68b08e006f4369a7935842c70de16132
tree94741cf825282ba18f1f1a533b23f9f4ed35dca6
parent4037ba5847d04d143d5e165e90e1fbc5fe760c59
parentff7ed9021cd72a7f82dd4301cdc266afdff458ad
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix #70720
  Align NEWS entry format
ext/standard/string.c