From: Felipe Pena Date: Sat, 10 May 2014 14:53:45 +0000 (-0300) Subject: Merge branch 'PHP-5.4' into PHP-5.5 X-Git-Tag: php-5.5.13RC1~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bea8cf9cd65f6b4d4093ea7c68a19a588c7fbd0;p=php Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: - Fixed missing NULL check in SimpleXMLElement::xpath() --- 8bea8cf9cd65f6b4d4093ea7c68a19a588c7fbd0