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


Trivial merge