]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Mon, 9 Nov 2015 23:40:49 +0000 (00:40 +0100)
committerAnatol Belski <ab@php.net>
Mon, 9 Nov 2015 23:40:49 +0000 (00:40 +0100)
* PHP-7.0:
  additional catch to bug #70863


Trivial merge