]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Sat, 23 Aug 2014 22:09:00 +0000 (00:09 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sat, 23 Aug 2014 22:09:00 +0000 (00:09 +0200)
commita90d05a4304a2ef832afe059dc19c7f14ca86f58
treec51c8488d1f5d763c9aa51aa85132ab7f31c2109
parentc4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53
parentcb41a7bad1350f1c9bd162abf52eea128a395e0a
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  this test depends on the simplexml ext, not just on xml