From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 17 Mar 2016 19:44:23 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~458
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48e3459567fc5d1c41ab0198254d272ce9a490e0;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
---

48e3459567fc5d1c41ab0198254d272ce9a490e0