]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 18 Mar 2015 05:39:21 +0000 (22:39 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 18 Mar 2015 05:39:21 +0000 (22:39 -0700)
* PHP-5.5:
  5.4.40 next


Trivial merge