]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Thu, 26 Dec 2013 07:52:39 +0000 (11:52 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 26 Dec 2013 07:52:39 +0000 (11:52 +0400)
commit0ff0e82f26fcae352007c08873ab408c12948ad9
tree6b29aad8822f2f4e693eea3ff7f5f5dc0a435d76
parent1e411ebdf5fa56fa8f8870d22a5bdd21c54caf69
parent6414fe283e3931d87416a155f4cfbaaf5ffca1ad
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
NEWS