From: Stanislav Malyshev <stas@php.net>
Date: Mon, 27 Jun 2016 19:32:58 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.9RC1~15^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec82c6b4e1048e5c207799fb4424e9728eb20173;p=php

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
---

ec82c6b4e1048e5c207799fb4424e9728eb20173