From: Xinchen Hui <laruence@php.net>
Date: Wed, 9 May 2012 03:28:09 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67075609d3082a09cb469e77343bed005fc29ba8;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions)
---

67075609d3082a09cb469e77343bed005fc29ba8