]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Wed, 19 Jun 2013 05:59:34 +0000 (22:59 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 19 Jun 2013 05:59:34 +0000 (22:59 -0700)
* PHP-5.5:
  5.4.18 next


Trivial merge