]> granicus.if.org Git - php/commitdiff
Merge branch 'PHp-7.0'
authorStanislav Malyshev <stas@php.net>
Mon, 15 Feb 2016 08:10:27 +0000 (00:10 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 15 Feb 2016 08:10:27 +0000 (00:10 -0800)
* PHp-7.0:
  Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
  Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()


Trivial merge