]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Wed, 3 Dec 2014 15:49:13 +0000 (16:49 +0100)
committerAnatol Belski <ab@php.net>
Wed, 3 Dec 2014 15:49:13 +0000 (16:49 +0100)
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #55541 errors spawn MessageBox, which blocks test automation

1  2 
Zend/zend_ini_parser.y
main/main.c

Simple merge
diff --cc main/main.c
Simple merge