]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 01:32:07 +0000 (02:32 +0100)
committerFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 01:32:07 +0000 (02:32 +0100)
* PHP-5.4:
  fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627


Trivial merge