diff options
author | Felipe Pena <felipensp@gmail.com> | 2014-05-10 11:53:45 -0300 |
---|---|---|
committer | Felipe Pena <felipensp@gmail.com> | 2014-05-10 11:53:45 -0300 |
commit | 8bea8cf9cd65f6b4d4093ea7c68a19a588c7fbd0 (patch) | |
tree | b3044efbf52377883c78ddbd147eeaca17809519 /ext/mbstring/php_mbregex.c | |
parent | 2379ec474eb70ea73c86d03ca3722e7b33bee08e (diff) | |
parent | 345f6d90d5947c5cf380db79c1c6366a72cc6e8d (diff) | |
download | php-git-8bea8cf9cd65f6b4d4093ea7c68a19a588c7fbd0.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed missing NULL check in SimpleXMLElement::xpath()
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions