Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

2010-07-05 19:37:03 +02:00
parent 68d9c40113 3e9e18aebb
commit 93d49e8ca8
79 changed files with 12964 additions and 13153 deletions
--- a/scripts/convertcfg.pl
+++ b/scripts/convertcfg.pl
@@ -7,9 +7,6 @@
 #
 # Takes input from STDIN, sends output to STDOUT
 #
-# By Robin Johnson robbat2@users.sourceforge.net
-# Many thanks to Patrick Lougheed pat@tfsb.org
-#

 while(<>) 
 {	s/\$cfg(\w+)/\$cfg\[\'$1\'\]/g;