]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 14 May 2014 05:22:03 +0000 (22:22 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 14 May 2014 05:22:03 +0000 (22:22 -0700)
* PHP-5.5:
  5.4.30 next


Trivial merge