]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 1 Apr 2014 08:12:06 +0000 (10:12 +0200)
committerAnatol Belski <ab@php.net>
Tue, 1 Apr 2014 08:12:06 +0000 (10:12 +0200)
* PHP-5.4:
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"

1  2 
ext/dom/document.c

Simple merge