From: Stanislav Malyshev <stas@php.net>
Date: Thu, 19 Apr 2012 18:03:12 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9a73a4cf52abfba667a4125f259dc3275b35a78;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  fix RCs
  Update to 5.4.2-dev

Conflicts:
	main/php_version.h
---

e9a73a4cf52abfba667a4125f259dc3275b35a78