]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/2120' into PHP-5.6
authorChristoph M. Becker <cmbecker69@gmx.de>
Sat, 24 Sep 2016 15:52:15 +0000 (17:52 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Sat, 24 Sep 2016 15:52:15 +0000 (17:52 +0200)
1  2 
Zend/zend_alloc.c

Simple merge