]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorXinchen Hui <laruence@gmail.com>
Wed, 23 Nov 2016 06:27:57 +0000 (14:27 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 23 Nov 2016 06:27:57 +0000 (14:27 +0800)
* PHP-7.1:
  Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name)


Trivial merge