From: Johannes Schlüter <johannes@php.net>
Date: Wed, 30 Jan 2013 23:58:52 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha5~47^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d6636364dd002734b67efe2b2c08b954b650a99;p=php

Merge branch 'PHP-5.3' into PHP-5.4

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

9d6636364dd002734b67efe2b2c08b954b650a99