From: Andrey Hristov Date: Wed, 19 Mar 2014 16:55:29 +0000 (+0200) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~462^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b86595a37c7437738f2b3c5254e8e36d3dd09234;p=php Merge branch 'PHP-5.5' into PHP-5.6 Conflicts: NEWS --- b86595a37c7437738f2b3c5254e8e36d3dd09234