From: Julien Pauli Date: Sat, 29 Nov 2014 10:38:57 +0000 (+0100) Subject: Merge branch 'pull-request/656' into PHP-5.5 X-Git-Tag: PRE_NATIVE_TLS_MERGE~115^2^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1813fe9f386facf8a8982eca3141007b09bdcc70;p=php Merge branch 'pull-request/656' into PHP-5.5 * pull-request/656: PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1 --- 1813fe9f386facf8a8982eca3141007b09bdcc70