]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorDavid Soria Parra <dsp@php.net>
Fri, 13 Apr 2012 14:33:43 +0000 (16:33 +0200)
committerDavid Soria Parra <dsp@php.net>
Fri, 13 Apr 2012 14:33:43 +0000 (16:33 +0200)
* PHP-5.4:
  configure.in: Check for README.GIT-RULES instead of README.SVN-RULES

1  2 
configure.in

diff --cc configure.in
Simple merge