Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  configure.in: Check for README.GIT-RULES instead of README.SVN-RULES

Conflicts:
	configure.in

diff --cc configure.in
index 49a88b138090334de81ec6efeac02f2e8f1dff1f,f038f87494f2b5adff1dd0b586b285d8f734640e..76f3598abf8b060df10e3b9367865ed28a6505ff
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -8,9 -30,8 +8,9 @@@ sinclude(Zend/acinclude.m4
  dnl Basic autoconf + automake initialization, generation of config.nice.
  dnl -------------------------------------------------------------------------
  
 -AC_PREREQ(2.13)
 +AC_PREREQ(2.59)
- AC_INIT(README.SVN-RULES)
+ AC_INIT(README.GIT-RULES)
 +ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
  
  PHP_CONFIG_NICE(config.nice)