From: Johannes Schlüter <johannes@php.net>
Date: Wed, 7 Nov 2012 23:03:37 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha1~9^2~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d95f7d2861b22de1144f25ebe9a5891a9d7ca17;p=php

Merge branch 'PHP-5.3' into PHP-5.4

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

9d95f7d2861b22de1144f25ebe9a5891a9d7ca17