Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Cleanup $ is not needed for git

diff --cc ext/interbase/config.m4
index dfd850b00ad889ab0552fb2253aa7af7c5d0e58e,4bb0710bca74e1d5343ababa0e1029bdef8d2467..6aa1b368c0fe64fd7885267c7897599b450f5a38
--- 1/ext/interbase/config.m4
--- 2/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@@ -1,9 -1,5 +1,5 @@@
- dnl
- dnl $Id$
- dnl
- 
  PHP_ARG_WITH(interbase,for InterBase support,
 -[  --with-interbase[=DIR]  Include InterBase support.  DIR is the InterBase base
 +[  --with-interbase[=DIR]    Include InterBase support.  DIR is the InterBase base
                            install directory [/usr/interbase]])
  
  if test "$PHP_INTERBASE" != "no"; then

diff --cc ext/interbase/tests/skipif.inc
index 8f903a5ea549f14838b31419f09ece7b7da55073,7cde759e5bd316a470c0a656b2aeeef63894862f..11d0d80bc662113ff9deebe79bf87ab1b5037db3
--- 1/ext/interbase/tests/skipif.inc
--- 2/ext/interbase/tests/skipif.inc
+++ b/ext/interbase/tests/skipif.inc
@@@ -1,6 -1,6 +1,6 @@@
- <?php /* $Id$ */
+ <?php
  
 -if (!extension_loaded("interbase")) print "skip interbase extension not available";
 +if (!extension_loaded("interbase")) print "skip interbase extension not available"; 
  require("interbase.inc");
  if(!@ibase_connect($test_base)){
          die("skip cannot connnect");

diff --cc ext/pdo_firebird/config.m4
index a89ab2aea53a8dbb3b546f88bde5142856b23e8d,2ff3c29b7d9bdcaeefb7f277cd1c0df891e244a0..f9188a09b7cda51ff1dd1cfbc947ff5c48455618
--- 1/ext/pdo_firebird/config.m4
--- 2/ext/pdo_firebird/config.m4
+++ b/ext/pdo_firebird/config.m4
@@@ -1,10 -1,6 +1,6 @@@
- dnl
- dnl $Id$
- dnl
- 
  PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
  [  --with-pdo-firebird[=DIR] PDO: Firebird support.  DIR is the Firebird base
 -                            install directory [/opt/firebird]])
 +                          install directory [/opt/firebird]])
  
  if test "$PHP_PDO_FIREBIRD" != "no"; then