From: Julien Pauli <jpauli@php.net>
Date: Fri, 8 Jul 2016 13:05:13 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta1~147^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87fe485c3562eaba4c04b5cd03d1b234ab7b2e90;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Updated NEWS
  Backported bug #71144 (Segmentation fault when using cURL with ZTS)
  fix bug #72024 (microtime() leaks memory)

Conflicts:
	ext/curl/interface.c
---

87fe485c3562eaba4c04b5cd03d1b234ab7b2e90