From: Stanislav Malyshev <stas@php.net>
Date: Mon, 15 Feb 2016 08:09:30 +0000 (-0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.4RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e34a7a1b08342489e5ee1a83b00d98c4d9084c83;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()

Conflicts:
	ext/xsl/xsltprocessor.c
---

e34a7a1b08342489e5ee1a83b00d98c4d9084c83