From: Stanislav Malyshev <stas@php.net>
Date: Fri, 4 Jan 2013 01:27:19 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a72102f267b3e4782e186e30c52b14454e2fa499;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.12-dev
  This will be PHP 5.3.22

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

a72102f267b3e4782e186e30c52b14454e2fa499