]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Mon, 7 Mar 2016 21:05:46 +0000 (22:05 +0100)
committerAnatol Belski <ab@php.net>
Mon, 7 Mar 2016 21:05:46 +0000 (22:05 +0100)
* PHP-7.0:
  fix incompatible pointers on 64-bit


Trivial merge