From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 21 Mar 2016 08:43:55 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.6RC1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ead0dfc3c9736a0f5bbdb8f02c2f0dd963fa3278;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Update NEWS for efacdc3
  FIX #71831: CURLOPT_NOPROXY applied as long instead of string
---

ead0dfc3c9736a0f5bbdb8f02c2f0dd963fa3278