]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Wed, 9 May 2012 03:28:09 +0000 (11:28 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 9 May 2012 03:28:09 +0000 (11:28 +0800)
* PHP-5.4:
  Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions)


Trivial merge