]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 16 Apr 2014 07:48:31 +0000 (09:48 +0200)
committerAnatol Belski <ab@php.net>
Wed, 16 Apr 2014 07:48:31 +0000 (09:48 +0200)
commitb4c238c8cf3d8efcb307e18e51863e7eb01f4d32
treec036c434d51169a21951aaf7b51a21060aa5742a
parentea8370c29ac6940ce4acfe48688dfa2d9745cebd
parent9eb726b3ab2808b3c25ac966388e7d361bfbb21c
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #67079 Missing MIME types for XML/XSL files
sapi/cli/php_cli_server.c