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

1  2 
ext/simplexml/simplexml.c

Simple merge