]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 2 Sep 2014 22:04:00 +0000 (15:04 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Sep 2014 22:04:00 +0000 (15:04 -0700)
* PHP-5.5:
  5.4.34 is next


Trivial merge