]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Wed, 27 Apr 2016 12:34:29 +0000 (20:34 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 27 Apr 2016 12:34:29 +0000 (20:34 +0800)
* PHP-7.0:
  Use zend_string_safe_alloc


Trivial merge