From: Andrea Faulds <ajf@ajf.me>
Date: Sat, 20 Sep 2014 23:47:46 +0000 (+0100)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1fe5cb8c2ba47581c079d2b91e2fede29181dfe;p=php

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

e1fe5cb8c2ba47581c079d2b91e2fede29181dfe