]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorMatteo Beccati <mbeccati@php.net>
Wed, 19 Jun 2013 09:53:05 +0000 (11:53 +0200)
committerMatteo Beccati <mbeccati@php.net>
Wed, 19 Jun 2013 09:53:05 +0000 (11:53 +0200)
* PHP-5.4:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test


Trivial merge