From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 17 Oct 2014 04:28:20 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.3RC1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=560646662433d503a47075f4c2f8ee6760bd93fd;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
---

560646662433d503a47075f4c2f8ee6760bd93fd