]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Thu, 5 May 2016 07:18:24 +0000 (15:18 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 5 May 2016 07:18:24 +0000 (15:18 +0800)
* PHP-7.0:
  Fixed bug #72154 (pcntl_wait/pcntl_waitpid array internal structure overwrite)


Trivial merge