From: Stanislav Malyshev <stas@php.net>
Date: Wed, 27 Mar 2013 21:02:14 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~448^2~73^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d535a007d82340d4a6973468a67c40d69d0aed3;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  will be 5.4.15
  fix NEWS

Conflicts:
	configure.in
	main/php_version.h
---

5d535a007d82340d4a6973468a67c40d69d0aed3