]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Thu, 8 Sep 2016 15:49:47 +0000 (17:49 +0200)
committerAnatol Belski <ab@php.net>
Thu, 8 Sep 2016 15:49:47 +0000 (17:49 +0200)
* PHP-5.6:
  backport 59444347 and 3d7343f6


Trivial merge