]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorAnatol Belski <ab@php.net>
Sun, 24 Aug 2014 00:55:01 +0000 (02:55 +0200)
committerAnatol Belski <ab@php.net>
Sun, 24 Aug 2014 00:55:01 +0000 (02:55 +0200)
# By Ferenc Kovacs
# Via Ferenc Kovacs
* 'master' of git.php.net:php-src:
  this test depends on the simplexml ext, not just on xml


Trivial merge