]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Sat, 10 May 2014 14:53:45 +0000 (11:53 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sat, 10 May 2014 14:53:45 +0000 (11:53 -0300)
commit8bea8cf9cd65f6b4d4093ea7c68a19a588c7fbd0
treeb3044efbf52377883c78ddbd147eeaca17809519
parent2379ec474eb70ea73c86d03ca3722e7b33bee08e
parent345f6d90d5947c5cf380db79c1c6366a72cc6e8d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
ext/simplexml/simplexml.c