]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorFelipe Pena <felipensp@gmail.com>
Sat, 10 May 2014 14:53:54 +0000 (11:53 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sat, 10 May 2014 14:53:54 +0000 (11:53 -0300)
* PHP-5.5:
  - Fixed missing NULL check in SimpleXMLElement::xpath()


Trivial merge