]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Mon, 27 Jun 2016 19:32:58 +0000 (12:32 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 27 Jun 2016 19:32:58 +0000 (12:32 -0700)
commitec82c6b4e1048e5c207799fb4424e9728eb20173
treeb1d199c2869f3d06955e940f5bbc56305befa766
parentb5fc4dbf210fdbf46b037996c8479d1844e81f5d
parentb8487b6a7dcf102dd2015105b54279dad701b97b
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
ext/standard/string.c