]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Mon, 12 Dec 2016 00:29:23 +0000 (01:29 +0100)
committerAnatol Belski <ab@php.net>
Mon, 12 Dec 2016 00:29:23 +0000 (01:29 +0100)
* PHP-7.0:
  fix datatype for zpp, yet a followup on bug #73679


Trivial merge