From: Stanislav Malyshev <stas@php.net>
Date: Tue, 18 Feb 2014 05:22:03 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.10RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58b7f21c3ff60f8a2da4334e933d425859c3985c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.27 now
  update NEWS

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

58b7f21c3ff60f8a2da4334e933d425859c3985c