From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 26 Dec 2013 07:52:39 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ff0e82f26fcae352007c08873ab408c12948ad9;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
	NEWS
---

0ff0e82f26fcae352007c08873ab408c12948ad9