]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 6 Aug 2014 04:29:27 +0000 (21:29 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 6 Aug 2014 04:29:27 +0000 (21:29 -0700)
* PHP-5.5:
  5.4.33-dev now


Trivial merge