]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorSara Golemon <pollita@php.net>
Thu, 28 Sep 2017 14:48:43 +0000 (10:48 -0400)
committerSara Golemon <pollita@php.net>
Thu, 28 Sep 2017 14:48:43 +0000 (10:48 -0400)
* PHP-7.1:
  Fix word alignment on ILP64.

1  2 
Zend/zend_alloc.c

Simple merge