From: Stanislav Malyshev <stas@php.net>
Date: Fri, 1 Mar 2013 05:29:40 +0000 (-0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha6~12^2~11^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03dfa08da93587f14106130d473168388b5009b6;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  5.4.24-dev
  5.3.23RC1

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

03dfa08da93587f14106130d473168388b5009b6