]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e411eb 6414fe2)
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)
* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
NEWS


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.