]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 10:25:51 +0000 (11:25 +0100)
committerAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 10:25:51 +0000 (11:25 +0100)
* PHP-7.0:
  refix bug #69111, crash in 5.6 only


Trivial merge