]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Sat, 23 Aug 2014 22:09:31 +0000 (00:09 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sat, 23 Aug 2014 22:09:31 +0000 (00:09 +0200)
* PHP-5.5:
  this test depends on the simplexml ext, not just on xml


Trivial merge