From: Stanley Sufficool <ssufficool@php.net>
Date: Thu, 23 Oct 2014 03:14:58 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~49^2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ba114e0a6828cb49a46ce79d388c23e4c018b7a;p=php

Merge branch 'master' of https://git.php.net/push/php-src
---

5ba114e0a6828cb49a46ce79d388c23e4c018b7a