From: Matteo Beccati <mbeccati@php.net>
Date: Wed, 29 Oct 2014 10:32:12 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.3RC1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb4e4b7bca733982e96e58353256f27b3ebe7328;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now

Conflicts:
	configure.in
	main/php_version.h
---

eb4e4b7bca733982e96e58353256f27b3ebe7328