From: David Soria Parra <dsp@php.net>
Date: Fri, 13 Apr 2012 14:33:25 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de6dfe5bbd197e6387f0044b857b518e29e27283;p=php

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
---

de6dfe5bbd197e6387f0044b857b518e29e27283
diff --cc configure.in
index 49a88b1380,f038f87494..76f3598abf
--- a/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)