]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 9 Jul 2014 04:42:20 +0000 (21:42 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 9 Jul 2014 04:42:20 +0000 (21:42 -0700)
* PHP-5.5:
  5.4.31
  fix unstable test
  5.5.16 now


Trivial merge