From: Johannes Schlüter Date: Thu, 3 Jan 2013 21:59:38 +0000 (+0100) Subject: Merge branch 'PHP-5.3' into PHP-5.4 X-Git-Tag: php-5.5.0alpha3~18^2^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aaecb99c6bede3c0d9e1a90ff5237ec49652fc01;p=php Merge branch 'PHP-5.3' into PHP-5.4 Conflicts: configure.in main/php_version.h --- aaecb99c6bede3c0d9e1a90ff5237ec49652fc01