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