]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorXinchen Hui <laruence@gmail.com>
Fri, 9 Dec 2016 07:56:41 +0000 (15:56 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 9 Dec 2016 07:56:41 +0000 (15:56 +0800)
* PHP-7.1:
  Fixed bug #73646 (mb_ereg_search_init null pointer dereference)


Trivial merge