From: Stanislav Malyshev <stas@php.net>
Date: Tue, 29 Jan 2013 20:34:45 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26de5cc57fa39b9682cd5523711638d98fa6fddd;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  branched 5.4.12
  update NEWS

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

26de5cc57fa39b9682cd5523711638d98fa6fddd