]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 18 Mar 2015 00:10:14 +0000 (17:10 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 18 Mar 2015 00:10:14 +0000 (17:10 -0700)
* PHP-5.5:


Trivial merge