]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristopher Jones <sixd@php.net>
Fri, 15 Nov 2013 20:38:18 +0000 (12:38 -0800)
committerChristopher Jones <sixd@php.net>
Fri, 15 Nov 2013 20:38:18 +0000 (12:38 -0800)
* PHP-5.6:
  Update NEWS
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990


Trivial merge