From: Johannes Schlüter <johannes@php.net>
Date: Thu, 29 Mar 2012 09:43:26 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d8664b90b4007b81206d39f3453eb4e7987776d;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  This will be PHP 5.3.12

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

1d8664b90b4007b81206d39f3453eb4e7987776d