]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 12 Dec 2014 12:26:17 +0000 (13:26 +0100)
committerAnatol Belski <ab@php.net>
Fri, 12 Dec 2014 12:26:17 +0000 (13:26 +0100)
commitf4311686cc2c7d07abce2b752b4e8597771c5b25
treea479b88e6f8d3c6ed094a6451b36c0e2189a3f87
parent5dbeb9e65eb01fb974cd88025a4054f4e51bdbf2
parentb1709b8ff0ad3a4beb1b560301d886aa49946599
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fixed bug #68583 Crash in timeout thread

Conflicts:
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend.c
Zend/zend_execute.h
Zend/zend_execute_API.c