From: Xinchen Hui <laruence@php.net>
Date: Mon, 15 Sep 2014 08:54:36 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~85^2~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a74239330570fbd8ba07d93ef37bd594efe0c0e4;p=php

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

a74239330570fbd8ba07d93ef37bd594efe0c0e4