]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Thu, 26 Dec 2013 07:53:03 +0000 (11:53 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 26 Dec 2013 07:53:03 +0000 (11:53 +0400)
* PHP-5.6:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

1  2 
Zend/zend_alloc.c

Simple merge