]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Wed, 16 Apr 2014 07:50:24 +0000 (09:50 +0200)
committerAnatol Belski <ab@php.net>
Wed, 16 Apr 2014 07:50:24 +0000 (09:50 +0200)
* PHP-5.6:
  updated NEWS
  Fixed bug #67079 Missing MIME types for XML/XSL files

1  2 
sapi/cli/php_cli_server.c

Simple merge