]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorRemi Collet <remi@php.net>
Wed, 16 Sep 2015 12:32:23 +0000 (14:32 +0200)
committerRemi Collet <remi@php.net>
Wed, 16 Sep 2015 12:32:23 +0000 (14:32 +0200)
* PHP-7.0:
  fix regressio introduce in 22e23e7cb8ca9aa134d138b5fed031af6c842b44


Trivial merge