]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Tue, 13 Oct 2015 12:21:26 +0000 (15:21 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 13 Oct 2015 12:21:26 +0000 (15:21 +0300)
* PHP-7.0:
  Fixed incorrect "peak" memory consumption calculation.


Trivial merge