]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Thu, 15 Sep 2016 11:29:26 +0000 (13:29 +0200)
committerRemi Collet <remi@php.net>
Thu, 15 Sep 2016 11:29:26 +0000 (13:29 +0200)
* PHP-5.6:
  fix ZTS build


Trivial merge