From: Xinchen Hui <laruence@php.net>
Date: Mon, 9 Jul 2012 00:46:38 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~91^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e97cdf86b8db73c5d80e5eaeb7efc99ae6383de;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  update NEWS
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)
---

0e97cdf86b8db73c5d80e5eaeb7efc99ae6383de