]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Tue, 29 Mar 2016 09:26:09 +0000 (11:26 +0200)
committerAnatol Belski <ab@php.net>
Tue, 29 Mar 2016 09:26:09 +0000 (11:26 +0200)
* PHP-5.6:


Trivial merge