this test depends on the simplexml ext, not just on xml
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  this test depends on the simplexml ext, not just on xml
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  this test depends on the simplexml ext, not just on xml
Merge branch 'PHP-5.6'

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

Conflicts:
	ext/simplexml/tests/bug62328.phpt
fixes to %pd format usage
note on %pd format
Merge branch 'master' of git.php.net:php-src

# By Ferenc Kovacs
# Via Ferenc Kovacs
* 'master' of git.php.net:php-src:
  this test depends on the simplexml ext, not just on xml
fix a phrase