]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 20:08:11 +0000 (22:08 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 20:08:11 +0000 (22:08 +0200)
* PHP-5.5:
  test fixes


Trivial merge