From: Adam Harvey <aharvey@php.net>
Date: Tue, 8 Jan 2013 03:45:26 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9566314d626770c16875476a4c5dce0e63a57441;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add NEWS for the previously cherry picked commit.
  sapi/litespeed/lsapi_main.c: Fix bug #63228

Conflicts:
	sapi/litespeed/lsapi_main.c
---

9566314d626770c16875476a4c5dce0e63a57441