]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Mon, 11 Jan 2016 19:39:52 +0000 (20:39 +0100)
committerAnatol Belski <ab@php.net>
Mon, 11 Jan 2016 19:39:52 +0000 (20:39 +0100)
* PHP-5.6:
  backport 9a07245b728714de09361ea16b9c6fcf70cb5685 from 7.0


Trivial merge