]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 27 Jun 2016 19:32:11 +0000 (12:32 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 27 Jun 2016 19:32:11 +0000 (12:32 -0700)
commitb8487b6a7dcf102dd2015105b54279dad701b97b
treef38501ca52e215d94f0453d84c81064cdf406d3a
parent1314db71091a171e9c2a6b27a4a74c628e76ada9
parent25bd11cf271f801efa346195d540f3d8e3bcb0ef
Merge branch 'PHP-5.5' into PHP-5.6

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

Conflicts:
configure.in
main/php_version.h
ext/standard/string.c