From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 10 May 2014 14:53:54 +0000 (-0300)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~292^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c54b9f7b7226394dedc8ebef684e688041598d37;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
---

c54b9f7b7226394dedc8ebef684e688041598d37