]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Tue, 2 Feb 2016 17:17:16 +0000 (18:17 +0100)
committerJulien Pauli <jpauli@php.net>
Tue, 2 Feb 2016 17:17:16 +0000 (18:17 +0100)
commit0d1d814e1acbf8a3c75d5b9f770db322989e5b20
tree6c792aae21c224193a4ce3d072cf63e3628b2c58
parentf7c3f54be9654861209a5c830ce1ec4bd6aec7f6
parented80ca00f40866001c024288171e35cfc0b078c4
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Updated NEWS
  Fix #70720

Conflicts:
ext/standard/string.c
ext/standard/tests/strings/bug70720.phpt
ext/standard/string.c