From: Xinchen Hui <laruence@php.net>
Date: Mon, 10 Nov 2014 15:38:33 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_NATIVE_TLS_MERGE~130^2~34^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28ee04f4804055f03b209ab6489c442ab5a49b00;p=php

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

28ee04f4804055f03b209ab6489c442ab5a49b00