Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Wed, 19 Jun 2013 10:26:53 +0000 (12:26 +0200)
committerRemi Collet <remi@php.net>
Wed, 19 Jun 2013 10:26:53 +0000 (12:26 +0200)
* PHP-5.4:
  Related to bug #65047 (Test skip on client / server version)


Trivial merge