From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 13 Oct 2015 12:21:26 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~971
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2741090bfa6bdd79115d5b6f136a0eee83dd32bd;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed incorrect "peak" memory consumption calculation.
---

2741090bfa6bdd79115d5b6f136a0eee83dd32bd