From: Johannes Schlüter <johannes@php.net>
Date: Thu, 4 Oct 2012 00:37:04 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~21^2~13^2~2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bbc489527d9a762fa98cffb353f007d60090a3c;p=php

Merge branch 'PHP-5.3' into PHP-5.4

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

5bbc489527d9a762fa98cffb353f007d60090a3c