From: Stanislav Malyshev Date: Mon, 1 Dec 2014 05:38:30 +0000 (-0800) Subject: Merge branch 'PHP-5.4' into PHP-5.5 X-Git-Tag: PRE_NATIVE_TLS_MERGE~101^2^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7eedbe9a685d6047dc04b29121980c2c6773251;p=php Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: update news Conflicts: ext/standard/crypt.c --- f7eedbe9a685d6047dc04b29121980c2c6773251