From: Anatoliy Belsky <ab@php.net>
Date: Tue, 15 Jan 2013 21:39:49 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18e160411e364ee02eff12e8ab516be9911be393;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed build
  NEWS for bug #63893

Conflicts:
	NEWS
---

18e160411e364ee02eff12e8ab516be9911be393