From: Ferenc Kovacs <tyrael@php.net>
Date: Sat, 23 Aug 2014 22:09:00 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.17RC1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a90d05a4304a2ef832afe059dc19c7f14ca86f58;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

a90d05a4304a2ef832afe059dc19c7f14ca86f58