From: Bob Weinand Date: Sun, 13 Apr 2014 17:40:39 +0000 (+0200) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~396^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3636a91adc0e0aac20870f004d4bbbd45c16262c;p=php Merge branch 'PHP-5.5' into PHP-5.6 --- 3636a91adc0e0aac20870f004d4bbbd45c16262c